Changeset 25746

Timestamp:

Oct 2, 2009, 12:12:44 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090715/psphot

Files:

• doc/efficiency.txt (modified) (1 prop)
• src/psphotEfficiency.c (modified) (1 prop)
• src/psphotFake.c (modified) (1 prop)
• src/psphotModelGroupInit.c (modified) (3 diffs)
• src/psphotRadialProfileByAngles.c (modified) (1 prop)
• src/psphotReadout.c (modified) (1 diff)
• src/psphotReadoutMinimal.c (modified) (1 diff)
• src/psphotVersion.c (modified) (1 diff)

branches/eam_branches/20090715/psphot/src/psphotModelGroupInit.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-// Add locally-defined models here.  As these mature, they can be moved to 
+// Add locally-defined models here.  As these mature, they can be moved to
 // psModule/src/objects/models
 
@@ -8 +8 @@
 
 static pmModelClass userModels[] = {
-    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelParamsFromPSF_TEST1, pmModelFitStatus_TEST1},
-    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelParamsFromPSF_STRAIL, pmModelFitStatus_STRAIL},
+    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelParamsFromPSF_TEST1, pmModelFitStatus_TEST1, NULL},
+    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelParamsFromPSF_STRAIL, pmModelFitStatus_STRAIL, NULL},
 };
 
-void psphotModelClassInit (void) 
-{ 
+void psphotModelClassInit (void)
+{
 
     // if pmModelClassInit returns false, we have already init'ed
@@ -20 +20 @@
     int Nmodels = sizeof (userModels) / sizeof (pmModelClass);
     for (int i = 0; i < Nmodels; i++) {
-        pmModelClassAdd (&userModels[i]);
+        pmModelClassAdd (&userModels[i]);
     }
     return;

branches/eam_branches/20090715/psphot/src/psphotReadout.c

@@ -17 +17 @@
     // jointly by the multiple threads, not the total time used by all threads.
     psTimerStart ("psphotReadout");
+
+    pmModelClassSetLimits(PM_MODEL_LIMITS_LAX);
 
     // select the current recipe

branches/eam_branches/20090715/psphot/src/psphotReadoutMinimal.c

@@ -14 +14 @@
     // jointly by the multiple threads, not the total time used by all threads.
     psTimerStart ("psphotReadout");
+
+    pmModelClassSetLimits(PM_MODEL_LIMITS_LAX);
 
     // select the current recipe

branches/eam_branches/20090715/psphot/src/psphotVersion.c

@@ -30 +30 @@
 psString psphotVersionLong(void)
 {
-    psString version = psLibVersion();  // Version, to return
-    psString source = psLibSource();    // Source
+    psString version = psphotVersion();  // Version, to return
+    psString source = psphotSource();    // Source
 
     psStringPrepend(&version, "psphot ");