Changeset 14546 for branches/eam_branch_20070817/psModules/src/objects/pmSourceUtils.c

Timestamp:

Aug 19, 2007, 3:58:16 PM (19 years ago)

Author:

magnier

Message:

defining new pmSourceFitSet APIs which can use variable models; adding functions to add sources to cell (not chips)

File:

• branches/eam_branch_20070817/psModules/src/objects/pmSourceUtils.c (modified) (2 diffs)

branches/eam_branch_20070817/psModules/src/objects/pmSourceUtils.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.1.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-17 21:01:59 $
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-20 01:58:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -76 +76 @@
     }
 
-    // XXX I don't yet know how this function should be defined
-# if (0) 
-    source->peak = pmPeakAlloc ();
+    pmCell *cell = readout->parent;
 
-    float x = model->params->data.F32[PM_PAR_XPOS];
-    float y = model->params->data.F32[PM_PAR_YPOS];
+    float Io    = model->params->data.F32[PM_PAR_I0];
+    float xChip = model->params->data.F32[PM_PAR_XPOS];
+    float yChip = model->params->data.F32[PM_PAR_YPOS];
 
-    // XXX need to define the radius in some rational way
-    // XXX x,y are defined wrt readout->image parent, but the model
-    // parameters are defined wrt chip coordinates
-    pmSourceDefinePixels (source, readout, x, y, radius);
-# endif
+    source->peak = pmPeakAlloc (xChip, yChip, Io, PM_PEAK_LONE);
+
+    int x0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
+    int y0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
+    int xParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY");
+    int yParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY");
+
+    // XXX whose binning? 
+    int xBin = psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"); // Binning in x and y
+    int yBin = psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"); // Binning in x and y
+
+    // Position on the cell 
+    float xCell = PM_CHIP_TO_CELL(xChip, x0Cell, xParityCell, xBin);
+    float yCell = PM_CHIP_TO_CELL(yChip, y0Cell, yParityCell, yBin);
+
+    // Position on the readout
+    // float xReadout = CELL_TO_READOUT(xCell, x0Readout);
+    // float yReadout = CELL_TO_READOUT(yCell, y0Readout);
+    
+    float radius = 5.0; // XXX need to define the radius in some rational way
+
+    pmSourceDefinePixels (source, readout, xCell, yCell, radius);
 
     return (source);