Changeset 36868

Timestamp:

Jun 13, 2014, 11:09:24 AM (12 years ago)

Author:

eugene

Message:

ensure pmPSF_AxesToModel and pmPSF_ModelToAxes uses class->useReff (not the old model->type)

Location:

trunk

Files:

• ppSim/src/ppSimInsertGalaxies.c (modified) (1 diff)
• ppSim/src/ppSimInsertStars.c (modified) (1 diff)
• psastro/src/psastroConvert.c (modified) (1 diff)
• psphot/src/psphotFullForceSummaryReadout.c (modified) (2 diffs)
• psphot/src/psphotGalaxyShape.c (modified) (3 diffs)
• psphot/src/psphotLoadSRCTEXT.c (modified) (1 diff)
• pswarp/src/pswarpTransformSources.c (modified) (1 diff)

trunk/ppSim/src/ppSimInsertGalaxies.c

@@ -145 +145 @@
             axes.minor       = galaxy->Rmin;
             axes.theta       = galaxy->theta;
-            pmPSF_AxesToModel (PAR, axes, type);
+            pmPSF_AxesToModel (PAR, axes, model->class->useReff);
         }
         psF64 Area = 2.0 * M_PI * galaxy->Rmaj * galaxy->Rmin;

trunk/ppSim/src/ppSimInsertStars.c

@@ -126 +126 @@
         // XXX set the mag & err values (should this be done in pmSourceFromModel?)
         // XXX i should be applying the gain and the correct effective area
-        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->type);
+        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->class->useReff);
         float Area = 2.0 * M_PI * axes.major * axes.minor;
 

trunk/psastro/src/psastroConvert.c

@@ -199 +199 @@
         // effect (all affected data was processed BEFORE the bug was introduced), and it
         // does not affect any of the PV2 or PV3 data processed AFTER the bug was fixed.
-        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type);
+        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
 
         pmAstromObj *obj = pmAstromObjAlloc ();

trunk/psphot/src/psphotFullForceSummaryReadout.c

@@ -425 +425 @@
                 // copy the best fit params to the model
                 // fractional radii with the lowest chisq
-                psEllipseAxes axes = pmPSF_ModelToAxes(model->params->data.F32, model->type);
+                psEllipseAxes axes = pmPSF_ModelToAxes(model->params->data.F32, model->class->useReff);
 
                 // examine the params for the trial with minimum chisq.
@@ -637 +637 @@
                 // now save the model parameters in the model structure
 
-                pmPSF_AxesToModel (model->params->data.F32, axes, modelType);
+                pmPSF_AxesToModel (model->params->data.F32, axes, model->class->useReff);
 
                 model->mag = -2.5 * log10(flux0);

trunk/psphot/src/psphotGalaxyShape.c

@@ -283 +283 @@
 
         // I have some source guess (e0, e1, e2)
-        psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, modelType);
+        psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, model->class->useReff);
 
         float fRmajorBest = NAN;
@@ -295 +295 @@
                 testAxes.minor = guessAxes.minor * fRminor;
                 
-                pmPSF_AxesToModel (PAR, testAxes, modelType);
+                pmPSF_AxesToModel (PAR, testAxes, model->class->useReff);
                 
                 psphotGalaxyShapeSource (pcm, source, galaxyFits, maskVal, psfSize, true);
@@ -324 +324 @@
 #endif
             
-            pmPSF_AxesToModel (PAR, testAxes, modelType);
+            pmPSF_AxesToModel (PAR, testAxes, model->class->useReff);
                 
             psphotGalaxyShapeSource (pcm, source, galaxyFits, maskVal, psfSize, false);

trunk/psphot/src/psphotLoadSRCTEXT.c

@@ -73 +73 @@
             dPAR[PM_PAR_I0]   = 0.0;
 
-            pmPSF_AxesToModel (PAR, axes, modelType);
+            pmPSF_AxesToModel (PAR, axes, model->class->useReff);
 
             float peakFlux    = 1.0;

trunk/pswarp/src/pswarpTransformSources.c

@@ -120 +120 @@
 #if 0
         // XXX Note that this will not set the correct axes
-        psEllipseAxes axes = pmPSF_ModelToAxes(source->modelPSF->params->data.F32, 20.0, source->modelPSF->type);
-        pmPSF_AxesToModel(new->modelPSF->params->data.F32, axes, new->modelPSF->type);
+        psEllipseAxes axes = pmPSF_ModelToAxes(source->modelPSF->params->data.F32, 20.0, source->modelPSF->class->useReff);
+        pmPSF_AxesToModel(new->modelPSF->params->data.F32, axes, new->modelPSF->class->useReff);
 #endif