Index: branches/eam_branches/ipp-20151113/ippToPsps/config/tables.DO.vot
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/config/tables.DO.vot (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/config/tables.DO.vot (revision 39266)
@@ -6,15 +6,21 @@
Contains the positional information for difference detection objects in a number of coordinate systems. The objects associate difference detections within a one arcsecond radius. The number of detections in each filter from is listed, along with maximum coverage fractions. References: Szalay, A. S., Gray, J., Fekete, G., et al. 2007, arXiv:cs/0701164.
-
+
IAU name for this object.
-
+
Alternate Pan-STARRS name for this object.
-
+
Altername name for this object.
-
+
Altername name for this object.
+
+
+ Altername name for this object.
+
+
+ Well known name for this object.
Index: branches/eam_branches/ipp-20151113/ippToPsps/config/tables.FO.vot
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/config/tables.FO.vot (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/config/tables.FO.vot (revision 39266)
@@ -58,4 +58,10 @@
Standard deviation of PSF fluxes from forced single epoch g filter detections.
+
+ Magnitude from mean PSF flux from forced single epoch g filter detections.
+
+
+ Error in magnitude from mean PSF flux from forced single epoch g filter detections.
+
Mean Kron (1980) flux from forced single epoch g filter detections.
@@ -67,4 +73,10 @@
Standard deviation of Kron (198) fluxes from forced single epoch g filter detections.
+
+ Magnitude from mean Kron (1980) flux from forced single epoch g filter detections.
+
+
+ Error in magnitude from mean Kron (1980) flux from forced single epoch g filter detections.
+
Mean aperture flux from forced single epoch g filter detections.
@@ -76,4 +88,10 @@
Standard deviation of aperture fluxes from forced single epoch g filter detections.
+
+ Magnitude from mean aperture flux from forced single epoch g filter detections.
+
+
+ Error in magnitude from mean aperture flux from forced single epoch g filter detections.
+
Mean flux from forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.
@@ -88,4 +106,10 @@
Aperture fill factor for forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.
+
+ Magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.
+
Mean flux from forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.
@@ -100,4 +124,10 @@
Aperture fill factor for forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.
+
+ Magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.
+
Mean flux from forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.
@@ -111,5 +141,11 @@
Aperture fill factor for forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.
-
+
+
+ Magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.
+
Information flag bitmask indicating details of the photometry from forced single epoch g filter detections. Values listed in ObjectInfoFlags.
@@ -152,4 +188,10 @@
Standard deviation of PSF fluxes from forced single epoch r filter detections.
+
+ Magnitude from mean PSF flux from forced single epoch r filter detections.
+
+
+ Error in magnitude from mean PSF flux from forced single epoch r filter detections.
+
Mean Kron (1980) flux from forced single epoch r filter detections.
@@ -161,4 +203,10 @@
Standard deviation of Kron (198) fluxes from forced single epoch r filter detections.
+
+ Magnitude from mean Kron (1980) flux from forced single epoch r filter detections.
+
+
+ Error in magnitude from mean Kron (1980) flux from forced single epoch r filter detections.
+
Mean aperture flux from forced single epoch r filter detections.
@@ -170,4 +218,10 @@
Standard deviation of aperture fluxes from forced single epoch g filter detections.
+
+ Magnitude from mean aperture flux from forced single epoch r filter detections.
+
+
+ Error in magnitude from mean aperture flux from forced single epoch r filter detections.
+
Mean flux from forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.
@@ -182,4 +236,10 @@
Aperture fill factor for forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.
+
+ Magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.
+
Mean flux from forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.
@@ -194,4 +254,10 @@
Aperture fill factor for forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.
+
+ Magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.
+
Mean flux from forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.
@@ -205,4 +271,10 @@
Aperture fill factor for forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.
@@ -246,4 +318,10 @@
Standard deviation of PSF fluxes from forced single epoch i filter detections.
+
+ Magnitude from mean PSF flux from forced single epoch i filter detections.
+
+
+ Error in magnitude from mean PSF flux from forced single epoch i filter detections.
+
Mean Kron (1980) flux from forced single epoch i filter detections.
@@ -255,4 +333,10 @@
Standard deviation of Kron (198) fluxes from forced single epoch i filter detections.
+
+ Magnitude from mean Kron (1980) flux from forced single epoch i filter detections.
+
+
+ Error in magnitude from mean Kron (1980) flux from forced single epoch i filter detections.
+
Mean aperture flux from forced single epoch i filter detections.
@@ -264,4 +348,10 @@
Standard deviation of aperture fluxes from forced single epoch i filter detections.
+
+ Magnitude from mean aperture flux from forced single epoch i filter detections.
+
+
+ Error in magnitude from mean aperture flux from forced single epoch i filter detections.
+
Mean flux from forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.
@@ -276,4 +366,10 @@
Aperture fill factor for forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.
+
+ Magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.
+
Mean flux from forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.
@@ -288,4 +384,10 @@
Aperture fill factor for forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.
+
+ Magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.
+
Mean flux from forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.
@@ -300,4 +402,10 @@
Aperture fill factor for forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.
+
+ Magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.
+
Information flag bitmask indicating details of the photometry from forced single epoch i filter detections. Values listed in ObjectInfoFlags.
@@ -340,4 +448,10 @@
Standard deviation of PSF fluxes from forced single epoch z filter detections.
+
+ Magnitude from mean PSF flux from forced single epoch z filter detections.
+
+
+ Error in magnitude from mean PSF flux from forced single epoch z filter detections.
+
Mean Kron (1980) flux from forced single epoch z filter detections.
@@ -349,4 +463,10 @@
Standard deviation of Kron (198) fluxes from forced single epoch z filter detections.
+
+ Magnitude from mean Kron (1980) flux from forced single epoch z filter detections.
+
+
+ Error in magnitude from mean Kron (1980) flux from forced single epoch z filter detections.
+
Mean aperture flux from forced single epoch z filter detections.
@@ -358,4 +478,10 @@
Standard deviation of aperture fluxes from forced single epoch z filter detections.
+
+ Magnitude from mean aperture flux from forced single epoch z filter detections.
+
+
+ Error in magnitude from mean aperture flux from forced single epoch z filter detections.
+
Mean flux from forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.
@@ -370,4 +496,10 @@
Aperture fill factor for forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.
+
+ Magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.
+
Mean flux from forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.
@@ -382,4 +514,10 @@
Aperture fill factor for forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.
+
+ Magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.
+
Mean flux from forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.
@@ -394,4 +532,10 @@
Aperture fill factor for forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.
+
+ Magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.
+
Information flag bitmask indicating details of the photometry from forced single epoch z filter detections. Values listed in ObjectInfoFlags.
@@ -434,4 +578,10 @@
Standard deviation of PSF fluxes from forced single epoch y filter detections.
+
+ Magnitude from mean PSF flux from forced single epoch y filter detections.
+
+
+ Error in magnitude from mean PSF flux from forced single epoch y filter detections.
+
Mean Kron (1980) flux from forced single epoch y filter detections.
@@ -443,4 +593,10 @@
Standard deviation of Kron (198) fluxes from forced single epoch y filter detections.
+
+ Magnitude from mean Kron (1980) flux from forced single epoch y filter detections.
+
+
+ Error in magnitude from mean Kron (1980) flux from forced single epoch y filter detections.
+
Mean aperture flux from forced single epoch y filter detections.
@@ -452,4 +608,10 @@
Standard deviation of aperture fluxes from forced single epoch y filter detections.
+
+ Magnitude from mean aperture flux from forced single epoch y filter detections.
+
+
+ Error in magnitude from mean aperture flux from forced single epoch y filter detections.
+
Mean flux from forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.
@@ -464,4 +626,10 @@
Aperture fill factor for forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.
+
+ Magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.
+
Mean flux from forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.
@@ -476,4 +644,10 @@
Aperture fill factor for forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.
+
+ Magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.
+
Mean flux from forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.
@@ -487,4 +661,10 @@
Aperture fill factor for forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.
+
+
+ Error in magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.
Index: branches/eam_branches/ipp-20151113/ippToPsps/config/tables.OB.vot
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/config/tables.OB.vot (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/config/tables.OB.vot (revision 39266)
@@ -11,12 +11,18 @@
IAU name for this object.
-
+
Alternate Pan-STARRS name for this object.
-
+
+ Alternate name for this object.
+
+
Altername name for this object.
-
+
Altername name for this object.
+
+
+ Well known name for this object.
Index: branches/eam_branches/ipp-20151113/ippToPsps/jython/diffbatch.py
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/jython/diffbatch.py (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/jython/diffbatch.py (revision 39266)
@@ -275,5 +275,8 @@
sqlLine.group("psfWidMinor", self.psfFwhmMinor[num])
- sqlLine.group("kernel", self.getKeyValue(header, 'PPSUB.KERNEL'))
+ kernel = self.getKeyValue(header, 'PPSUB.KERNEL')
+ kernel = kernel.replace(",",";")
+
+ sqlLine.group("kernel", str(kernel))
sqlLine.group("mode", self.getKeyValue(header, 'SUBTRACTION.MODE'))
sqlLine.group("psfTheta", self.getKeyFloat(header, "%.8f", 'ANGLE'))
Index: branches/eam_branches/ipp-20151113/ippToPsps/jython/diffobjectbatch.py
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/jython/diffobjectbatch.py (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/jython/diffobjectbatch.py (revision 39266)
@@ -210,64 +210,7 @@
def updateDiffObjName(self):
##this is a 2 part update:
-
- self.logger.infoPair("updating diffObjName", "using means")
- ## use mean ra and dec (dec >= 0)
- sql = "update DiffDetObject set diffObjName = concat('PSO J', \
- lpad(floor(ra/15.),2,'0'), \
- lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \
- lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \
- '+', \
- lpad(floor(abs(dec_)),2,'0'), \
- lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \
- lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \
- ) where ra > -999 and dec_ > -999 and dec_ >= 0"
-
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
-
- ## use mean ra and dec (dec < 0)
-
- sql = "update DiffDetObject set diffObjName = concat('PSO J', \
- lpad(floor(ra/15.),2,'0'), \
- lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \
- lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \
- '-', \
- lpad(floor(abs(dec_)),2,'0'), \
- lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \
- lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \
- ) where ra > -999 and dec_ > -999 and dec_ < 0"
-
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
-
- ## Update altName with decimal form
- self.logger.infoPair("updating diffObjAltName1", "using means")
-
- sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \
- format(ra,4),'+',format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ >= 0 "
-
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \
- format(ra,4),format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ < 0"
-
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
+ self.logger.info("Names are now populated with the populateDiffObjectTable call")
+
+ return True
'''
@@ -322,4 +265,6 @@
sqlLine.group("ra", "RA_MEAN")
sqlLine.group("dec_", "DEC_MEAN")
+ sqlLine.group("diffObjName", "IAU_NAME")
+ sqlLine.group("diffObjPSOName", "PSO_NAME")
sqlLine.group("nDetections", "'0'")
sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
Index: branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedgalaxybatch.py
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedgalaxybatch.py (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedgalaxybatch.py (revision 39266)
@@ -182,4 +182,5 @@
sqlLine.group("a." + filter[1] + "GalMagErr", "b.MAG_ERR")
sqlLine.group("a." + filter[1] + "GalPhi", "b.THETA")
+ # CZW: Sersic index is fixed in insert_FGshape_dvopsps_catalog.c.
sqlLine.group("a." + filter[1] + "GalIndex", "b.SERSIC_INDEX")
sqlLine.group("a." + filter[1] + "GalFlags", "b.FLAGS")
Index: branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedobjectbatch.py
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedobjectbatch.py (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedobjectbatch.py (revision 39266)
@@ -168,10 +168,16 @@
,ForcedMeanObject." + filter[1] + "FPSFFluxErr = FLUX_PSF_WRP_ERR \
,ForcedMeanObject." + filter[1] + "FPSFFluxStd = FLUX_PSF_WRP_STDEV \
+ ,ForcedMeanObject." + filter[1] + "FPSFMag = MAG_PSF_WRP \
+ ,ForcedMeanObject." + filter[1] + "FPSFMagErr = MAG_PSF_WRP_ERR \
,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] + "FKronMag = MAG_KRON_WRP \
+ ,ForcedMeanObject." + filter[1] + "FKronMagErr = MAG_KRON_WRP_ERR \
,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] + "FApMag = MAG_AP_WRP \
+ ,ForcedMeanObject." + filter[1] + "FApMagErr = MAG_AP_WRP_ERR \
,ForcedMeanObject." + filter[1] + "Flags = FLAGS "
@@ -253,12 +259,18 @@
,ForcedMeanObject." + filter[1] + "FmeanflxR5Std = FLUX_STD_AP_R5 \
,ForcedMeanObject." + filter[1] + "FmeanflxR5Fill = FLUX_FIL_AP_R5 \
+ ,ForcedMeanObject." + filter[1] + "FmeanMagR5 = MAG_AP_R5 \
+ ,ForcedMeanObject." + filter[1] + "FmeanMagR5Err = MAG_ERR_AP_R5 \
,ForcedMeanObject." + filter[1] + "FmeanflxR6 = FLUX_AP_R6 \
,ForcedMeanObject." + filter[1] + "FmeanflxR6Err = FLUX_ERR_AP_R6 \
,ForcedMeanObject." + filter[1] + "FmeanflxR6Std = FLUX_STD_AP_R6 \
,ForcedMeanObject." + filter[1] + "FmeanflxR6Fill = FLUX_FIL_AP_R6 \
+ ,ForcedMeanObject." + filter[1] + "FmeanMagR6 = MAG_AP_R6 \
+ ,ForcedMeanObject." + filter[1] + "FmeanMagR6Err = MAG_ERR_AP_R6 \
,ForcedMeanObject." + filter[1] + "FmeanflxR7 = FLUX_AP_R7 \
,ForcedMeanObject." + filter[1] + "FmeanflxR7Err = FLUX_ERR_AP_R7 \
,ForcedMeanObject." + filter[1] + "FmeanflxR7Std = FLUX_STD_AP_R7 \
,ForcedMeanObject." + filter[1] + "FmeanflxR7Fill = FLUX_FIL_AP_R7 \
+ ,ForcedMeanObject." + filter[1] + "FmeanMagR7 = MAG_AP_R7 \
+ ,ForcedMeanObject." + filter[1] + "FmeanMagR7Err = MAG_ERR_AP_R7 \
,ForcedMeanObject." + filter[1] + "E1 = E1 \
,ForcedMeanObject." + filter[1] + "E2 = E2 "
Index: branches/eam_branches/ipp-20151113/ippToPsps/jython/objectbatch.py
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/jython/objectbatch.py (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/jython/objectbatch.py (revision 39266)
@@ -247,127 +247,7 @@
'''
def updateObjName(self):
- ##this is a 4 part update:
- self.logger.infoPair("updating objName", "using stacks")
-
- ## if we have a stackra and dec, use stackra and dec , dec >=0
-
- sql = "update ObjectThin set objName = concat('PSO J', \
- lpad(floor(raStack/15.),2,'0'), \
- lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
- lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
- '+', \
- lpad(floor(abs(decStack)),2,'0'), \
- lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
- lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
- ) where raStack > -999 and decStack > -999 and decStack >= 0"
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- ## if we have a stackra and dec, use stackra and dec, dec < 0
-
- sql = "update ObjectThin set objName = concat('PSO J', \
- lpad(floor(raStack/15.),2,'0'), \
- lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
- lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
- '-', \
- lpad(floor(abs(decStack)),2,'0'), \
- lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
- lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
- ) where raStack > -999 and decStack > -999 and decStack < 0"
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- self.logger.infoPair("updating objName", "using means")
-
-
- ## use mean ra and dec (dec >= 0)
- sql = "update ObjectThin set objName = concat('PSO J', \
- lpad(floor(raMean/15.),2,'0'), \
- lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
- lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
- '+', \
- lpad(floor(abs(decMean)),2,'0'), \
- lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
- lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
- ) where raMean > -999 and decMean > -999 and decMean >= 0 AND objName IS NULL"
-
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- ## use mean ra and dec (dec < 0)
-
- sql = "update ObjectThin set objName = concat('PSO J', \
- lpad(floor(raMean/15.),2,'0'), \
- lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
- lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
- '-', \
- lpad(floor(abs(decMean)),2,'0'), \
- lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
- lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
- ) where raMean > -999 and decMean > -999 and decMean < 0 AND objName IS NULL"
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
-
- # update altname
- self.logger.infoPair("updating objAltName1", "using stacks")
-
- sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
- format(raStack,4),'+',format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack >= 0 "
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
- format(raStack,4),format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack < 0 "
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- self.logger.infoPair("updating objAltName1", "using means")
-
- sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
- format(raMean,4),'+',format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean >= 0 AND objAltName1 IS NULL"
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
- sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
- format(raMean,4),format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean < 0 AND objAltName1 IS NULL"
- try:
- self.scratchDb.execute(sql)
- except:
- self.logger.errorPair("failed sql", sql)
- raise
- return False
-
-
-
-
+ self.logger.info("Names are now populated with the populateObjectThinTable call")
+
+ return True
'''
Populates the Object table
@@ -428,4 +308,6 @@
sqlLine.group("raMean", "RA_MEAN")
sqlLine.group("decMean", "DEC_MEAN")
+ sqlLine.group("objName", "IAU_NAME")
+ sqlLine.group("objPSOName", "PSO_NAME")
sqlLine.group("epochMean", "EPOCH_MEAN")
sqlLine.group("raMeanErr", "RA_ERR")
Index: branches/eam_branches/ipp-20151113/ippToPsps/jython/stackbatch.py
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/jython/stackbatch.py (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/jython/stackbatch.py (revision 39266)
@@ -92,4 +92,5 @@
validFilterCount=validFilterCount + 1
if (stackID <= 0):
+ self.stackEpochs[filter] = -999
continue
Index: branches/eam_branches/ipp-20151113/ippToPsps/test/mksasdata.dvo
===================================================================
--- branches/eam_branches/ipp-20151113/ippToPsps/test/mksasdata.dvo (revision 39224)
+++ branches/eam_branches/ipp-20151113/ippToPsps/test/mksasdata.dvo (revision 39266)
@@ -179,4 +179,23 @@
end
+# create a populated catdir with a set of cmf files, save the filenames in list for use by insert.exp
+macro mkcatdir.ffg
+ if ($0 != 2)
+ echo "mkcatdir.ffg (catdir)"
+ break
+ end
+
+ $catdir = $1
+
+ for i 0 $galfiles:n
+ list word -split $galfiles:$i
+ $cmffile = $word:0
+ $stkID = $word:1
+ $filter = $word:2
+ echo loadgalphot -D CATDIR $catdir -photcode GPC1.$filter.ForcedWarp -image-id $stkID $cmffile
+ exec loadgalphot -D CATDIR $catdir -photcode GPC1.$filter.ForcedWarp -image-id $stkID $cmffile
+ end
+end
+
macro mkcal
# run relphot