Changeset 38792

Timestamp:

Oct 6, 2015, 3:34:07 PM (11 years ago)

Author:

eugene

Message:

changes to comments

File:

• trunk/ippToPsps/jython/forcedobjectbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython/forcedobjectbatch.py

@@ -151 +151 @@
             filterID = self.scratchDb.getFilterID(filter[1])
 
-            # NOTE: Manipulation of FLAGS from cpsTable is to move ID_SECF_OBJ_EXT flag (0x01000000)
-            # from bit 24 to bit 13 so that it fits into the SMALLINT Object.Flags
-            # XXX EAM : 20140724 this manipulation is no longer needed : [grizy]Flags is now 4 byte (was 8 byte!)
-
             # set the MeanObject fields based largely on dvopsps cps fields:
 
@@ -169 +165 @@
                    " + cpsTable + " AS cps ON (cps.row = (ForcedMeanObject.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) \
                    SET \
-                    ForcedMeanObject." + filter[1] + "nTotal         = NWARP \
-                   ,ForcedMeanObject." + filter[1] + "nIncPSFFlux     = NUSED_WRP \
-                   ,ForcedMeanObject." + filter[1] + "nIncKronFlux    = NUSED_KRON_WRP \
-                   ,ForcedMeanObject." + filter[1] + "nIncApFlux      = NUSED_AP_WRP \
+                    ForcedMeanObject." + filter[1] + "nTotal           = NWARP \
+                   ,ForcedMeanObject." + filter[1] + "nIncPSFFlux      = NUSED_WRP \
+                   ,ForcedMeanObject." + filter[1] + "nIncKronFlux     = NUSED_KRON_WRP \
+                   ,ForcedMeanObject." + filter[1] + "nIncApFlux       = NUSED_AP_WRP \
                    ,ForcedMeanObject." + filter[1] + "FPSFFlux         = FLUX_PSF_WRP \
                    ,ForcedMeanObject." + filter[1] + "FPSFFluxErr      = FLUX_PSF_WRP_ERR \
@@ -182 +178 @@
                    ,ForcedMeanObject." + filter[1] + "FApFluxErr       = FLUX_AP_WRP_ERR \
                    ,ForcedMeanObject." + filter[1] + "FApFluxStd       = FLUX_AP_WRP_STDEV \
-                   ,ForcedMeanObject." + filter[1] + "Flags          = FLAGS "
+                   ,ForcedMeanObject." + filter[1] + "Flags            = FLAGS "
 
 
@@ -239 +235 @@
             filterID = self.scratchDb.getFilterID(filter[1])
 
-            # NOTE: Manipulation of FLAGS from cpsTable is to move ID_SECF_OBJ_EXT flag (0x01000000)
-            # from bit 24 to bit 13 so that it fits into the SMALLINT Object.Flags
-            # XXX EAM : 20140724 this manipulation is no longer needed : [grizy]Flags is now 4 byte (was 8 byte!)
-
-            # set the MeanObject fields based largely on dvopsps cps fields:
+            # set the ForcedMeanObject fields based largely on dvopsps cps fields:
 
             # XXX EAM 20140724 : filterCount is meant to match
@@ -257 +249 @@
                    " + cpyTable + " AS cpy ON (cpy.row = (ForcedMeanObject.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) \
                    SET \
-                   ForcedMeanObject." + filter[1] + "nIncR5          =  NMEAS \
+                   ForcedMeanObject."  + filter[1] + "nIncR5          =  NMEAS \
                    ,ForcedMeanObject." + filter[1] + "nIncR6          =  NMEAS \
                    ,ForcedMeanObject." + filter[1] + "nIncR7          =  NMEAS \