Changeset 38397 for trunk/ippToPsps/jython/forcedobjectbatch.py

Timestamp:

Jun 5, 2015, 5:09:21 PM (11 years ago)

Author:

heather

Message:

schema 21 / sas 39 ipptopsps - random now float/double, forced object column names changed to be less confusing

File:

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

trunk/ippToPsps/jython/forcedobjectbatch.py

@@ -173 +173 @@
                    ,ForcedMeanObject." + filter[1] + "nIncKronFlux    = NUSED_KRON_WRP \
                    ,ForcedMeanObject." + filter[1] + "nIncApFlux      = NUSED_AP_WRP \
-                   ,ForcedMeanObject." + filter[1] + "PSFFlux         = FLUX_PSF_WRP \
-                   ,ForcedMeanObject." + filter[1] + "PSFFluxErr      = FLUX_PSF_WRP_ERR \
-                   ,ForcedMeanObject." + filter[1] + "PSFFluxStd      = FLUX_PSF_WRP_STDEV \
-                   ,ForcedMeanObject." + filter[1] + "KronFlux        = FLUX_KRON_WRP \
-                   ,ForcedMeanObject." + filter[1] + "KronFluxErr     = FLUX_KRON_WRP_ERR \
-                   ,ForcedMeanObject." + filter[1] + "KronFluxStd     = FLUX_KRON_WRP_STDEV \
-                   ,ForcedMeanObject." + filter[1] + "ApFlux          = FLUX_AP_WRP \
-                   ,ForcedMeanObject." + filter[1] + "ApFluxErr       = FLUX_AP_WRP_ERR \
-                   ,ForcedMeanObject." + filter[1] + "ApFluxStd       = FLUX_AP_WRP_STDEV \
+                   ,ForcedMeanObject." + filter[1] + "FPSFFlux         = FLUX_PSF_WRP \
+                   ,ForcedMeanObject." + filter[1] + "FPSFFluxErr      = FLUX_PSF_WRP_ERR \
+                   ,ForcedMeanObject." + filter[1] + "FPSFFluxStd      = FLUX_PSF_WRP_STDEV \
+                   ,ForcedMeanObject." + filter[1] + "FKronFlux        = FLUX_KRON_WRP \
+                   ,ForcedMeanObject." + filter[1] + "FKronFluxErr     = FLUX_KRON_WRP_ERR \
+                   ,ForcedMeanObject." + filter[1] + "FKronFluxStd     = FLUX_KRON_WRP_STDEV \
+                   ,ForcedMeanObject." + filter[1] + "FApFlux          = FLUX_AP_WRP \
+                   ,ForcedMeanObject." + filter[1] + "FApFluxErr       = FLUX_AP_WRP_ERR \
+                   ,ForcedMeanObject." + filter[1] + "FApFluxStd       = FLUX_AP_WRP_STDEV \
                    ,ForcedMeanObject." + filter[1] + "Flags          = FLAGS "
 
@@ -333 +333 @@
         sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
         sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
-        sqlLine.group("randomForcedObjID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")
+        sqlLine.group("randomForcedObjID",        "RAND("+str(self.batchID)+")")
         sqlLine.group("nDetections",      "'0'")
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)