Changeset 40291 for trunk/Ohana/src/dvolens

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvolens/src/update_objects_catalog.c (modified) (1 diff)

trunk/Ohana/src/dvolens/src/update_objects_catalog.c

@@ -219 +219 @@
 
       // relphot sets measure->Mcal (setMcalOutput.c, called by setMrelFinal.c)
-      float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure->Mcal;
+      // XXX : I'm using McalAPER since these lens measurements are aperture-like, right?
+      float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure->McalAPER;
       float Fcal = 3630.8 * MagToFlux(Mcal);