Changeset 37773

Timestamp:

Dec 24, 2014, 8:56:14 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk (merged from ipp-20141119)

Location:

tags/ipp-20141224

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsreg (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/getstar (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool (modified) (1 prop)
• ippMonitor/czartool/czartool/Plotter.pm (modified) (1 prop)
• ippScripts/scripts/queuestaticsky.pl (modified) (1 prop)
• ippScripts/scripts/sc_remote_exec.pl (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs, 1 prop)
• psphot/src/psphotGalaxyParams.c (modified) (1 diff)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstamp_finish.pl (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (1 prop)
• pstamp/scripts/request_finish.pl (modified) (1 prop)

tags/ipp-20141224/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -319 +319 @@
 
     // define PSF model type
-    int modelType = pmModelClassGetType ("PS_MODEL_GAUSS");
+    int defaultModelType = pmModelClassGetType ("PS_MODEL_GAUSS");
+    int modelType = -1;
 
     // if header does not define the model, default to a gaussian
@@ -326 +327 @@
         modelType = pmModelClassGetType (PSF_NAME);
     }
-    assert (modelType > -1);
+    // work around bug in psphotFullForce
+    if (modelType < 0) {
+        modelType = defaultModelType;
+    }
+    // assert (modelType > -1);
 
     // do we expect to find lensing parameters?

tags/ipp-20141224/psphot/src/psphotGalaxyParams.c

@@ -164 +164 @@
             }
             psScalar *scalar = NULL;
-            scalar = job->args->data[5];
+            scalar = job->args->data[8];
             Next += scalar->data.S32;
-            scalar = job->args->data[6];
+            scalar = job->args->data[9];
             Npetro += scalar->data.S32;
-            scalar = job->args->data[7];
+            scalar = job->args->data[10];
             Nannuli += scalar->data.S32;
             psFree(job);