Changeset 37245 for trunk

Timestamp:

Aug 12, 2014, 4:09:26 PM (12 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20140717

Location:

trunk

Files:

• 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) (1 diff)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstamp_finish.pl (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (1 prop)

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -620 +620 @@
                 // XXX note that this mag is either calibrated or instrumental depending on existence of zero point 
                 float mag = (extpars->petrosianFlux > 0.0) ? -2.5*log10(extpars->petrosianFlux) + magOffset : NAN; // XXX zero point
+                // XXX NOTE EAM 20140806 : PETRO_MAG_ERR is inverted!! oops!!
                 float magErr = (extpars->petrosianFlux > 0.0) ? extpars->petrosianFlux / extpars->petrosianFluxErr : NAN; // XXX zero point
                 psMetadataAdd (row, PS_LIST_TAIL, "PETRO_MAG",        PS_DATA_F32, "Petrosian Magnitude", mag);