Index: /tags/ipp-20140114/ippToPsps/jython/dvo.py =================================================================== --- /tags/ipp-20140114/ippToPsps/jython/dvo.py (revision 36550) +++ /tags/ipp-20140114/ippToPsps/jython/dvo.py (revision 36551) @@ -65,5 +65,5 @@ if not self.correctDvo: print "*******************************************************************************" - self.logger.warning("switching to a new dvo: " + self.skychunk.dvoLocation) + self.logger.warning("switching to a new dvo: '" + self.skychunk.dvoLocation + "'") # response = raw_input("(y/n) ") # if response == "y": @@ -669,5 +669,24 @@ cmd += " -time-start " + time_start cmd += " -time-end " + time_end - + + useP2 = 0 + useST = 0 + + for batchType in self.skychunk.batchTypes: + self.logger.infoPair("batchType", batchType) + if batchType == "ST": + useST = 1 + if batchType == "P2": + useP2 = 1 + + if (useP2 ==0 and useST ==1): + #grab only stacks + cmd += " -photcode-start 11000 -photcode-end 11500" + + if (useP2 ==1 and useST==0): + #grabd only P2s + cmd += " -photcode-start 10000 -photcode-end 10577" + + self.logger.infoPair("Running dvopsps", cmd) p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE) Index: /tags/ipp-20140114/ippToPsps/jython/gpc1db.py =================================================================== --- /tags/ipp-20140114/ippToPsps/jython/gpc1db.py (revision 36550) +++ /tags/ipp-20140114/ippToPsps/jython/gpc1db.py (revision 36551) @@ -93,5 +93,7 @@ JOIN mergedvodbRun USING(minidvodb_id) \ JOIN mergedvodbProcessed USING (merge_id) \ - JOIN stackRun USING(stack_id) JOIN skycell USING(skycell_id) \ + JOIN stackRun USING(stack_id) \ + JOIN stackSumSkyfile using (stack_id) \ + JOIN skycell USING(skycell_id) \ WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \ AND minidvodbRun.state = 'merged' \ @@ -102,6 +104,8 @@ AND addRun.state = 'full' \ AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \ - AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) - + AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \ + AND mjd_obs >= (to_days('" + tstart + "')-678941) \ + AND mjd_obs <= (to_days('" + tend + "') - 678941) " + self.logger.infoPair("sql",sql) try: # XXX EAM : test output Index: /tags/ipp-20140114/ippToPsps/jython/queue.py =================================================================== --- /tags/ipp-20140114/ippToPsps/jython/queue.py (revision 36550) +++ /tags/ipp-20140114/ippToPsps/jython/queue.py (revision 36551) @@ -45,4 +45,5 @@ try: + print "why doesn't this work" self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb) except: Index: /tags/ipp-20140114/ippToPsps/jython/stackbatch.py =================================================================== --- /tags/ipp-20140114/ippToPsps/jython/stackbatch.py (revision 36550) +++ /tags/ipp-20140114/ippToPsps/jython/stackbatch.py (revision 36551) @@ -303,4 +303,50 @@ modelLong = model; + #does it have the EXT_COVAR in there? + + sql = "DESCRIBE SkyChip_xfit 'EXT_COVAR_%'" + rs = self.scratchDb.executeQuery(sql) + rs.first() + hasResult = rs.next() + if hasResult: + print "EXT_COVARs exist" + else: + print "No EXT_COVARS here" + + ext_covar_sql = "" + + if (hasResult): + ext_covar_sql = ", "+modelLong+"Covar11=b.EXT_COVAR_00_00, \ + "+modelLong+"Covar12=b.EXT_COVAR_00_01, \ + "+modelLong+"Covar13=b.EXT_COVAR_00_02, \ + "+modelLong+"Covar14=b.EXT_COVAR_00_03, \ + "+modelLong+"Covar15=b.EXT_COVAR_00_04, \ + "+modelLong+"Covar16=b.EXT_COVAR_00_05, \ + "+modelLong+"Covar17=b.EXT_COVAR_00_06, \ + "+modelLong+"Covar22=b.EXT_COVAR_01_01, \ + "+modelLong+"Covar23=b.EXT_COVAR_01_02, \ + "+modelLong+"Covar24=b.EXT_COVAR_01_03, \ + "+modelLong+"Covar25=b.EXT_COVAR_01_04, \ + "+modelLong+"Covar26=b.EXT_COVAR_01_05, \ + "+modelLong+"Covar27=b.EXT_COVAR_01_06, \ + "+modelLong+"Covar33=b.EXT_COVAR_02_02, \ + "+modelLong+"Covar34=b.EXT_COVAR_02_03, \ + "+modelLong+"Covar35=b.EXT_COVAR_02_04, \ + "+modelLong+"Covar36=b.EXT_COVAR_02_05, \ + "+modelLong+"Covar37=b.EXT_COVAR_02_06, \ + "+modelLong+"Covar44=b.EXT_COVAR_03_03, \ + "+modelLong+"Covar45=b.EXT_COVAR_03_04, \ + "+modelLong+"Covar46=b.EXT_COVAR_03_05, \ + "+modelLong+"Covar47=b.EXT_COVAR_03_06, \ + "+modelLong+"Covar55=b.EXT_COVAR_04_04, \ + "+modelLong+"Covar56=b.EXT_COVAR_04_05, \ + "+modelLong+"Covar57=b.EXT_COVAR_04_06, \ + "+modelLong+"Covar66=b.EXT_COVAR_05_05, \ + "+modelLong+"Covar67=b.EXT_COVAR_05_06, \ + "+modelLong+"Covar77=b.EXT_COVAR_06_06" + + + + sql = "UPDATE StackModelFit AS a, SkyChip_xfit AS b SET \ "+model+"Radius=b.EXT_WIDTH_MAJ, \ @@ -308,39 +354,13 @@ "+model+"FluxErr=ABS(b.EXT_INST_MAG_SIG) * POW(10, -0.4 * b.EXT_INST_MAG) / " + str(self.expTime) + " / 1.085736, \ "+model+"Ab=b.EXT_WIDTH_MAJ/b.EXT_WIDTH_MIN, \ - "+model+"Phi=b.EXT_THETA, \ - "+modelLong+"Covar11=b.EXT_COVAR_00_00, \ - "+modelLong+"Covar12=b.EXT_COVAR_00_01, \ - "+modelLong+"Covar13=b.EXT_COVAR_00_02, \ - "+modelLong+"Covar14=b.EXT_COVAR_00_03, \ - "+modelLong+"Covar15=b.EXT_COVAR_00_04, \ - "+modelLong+"Covar16=b.EXT_COVAR_00_05, \ - "+modelLong+"Covar17=b.EXT_COVAR_00_06, \ - "+modelLong+"Covar22=b.EXT_COVAR_01_01, \ - "+modelLong+"Covar23=b.EXT_COVAR_01_02, \ - "+modelLong+"Covar24=b.EXT_COVAR_01_03, \ - "+modelLong+"Covar25=b.EXT_COVAR_01_04, \ - "+modelLong+"Covar26=b.EXT_COVAR_01_05, \ - "+modelLong+"Covar27=b.EXT_COVAR_01_06, \ - "+modelLong+"Covar33=b.EXT_COVAR_02_02, \ - "+modelLong+"Covar34=b.EXT_COVAR_02_03, \ - "+modelLong+"Covar35=b.EXT_COVAR_02_04, \ - "+modelLong+"Covar36=b.EXT_COVAR_02_05, \ - "+modelLong+"Covar37=b.EXT_COVAR_02_06, \ - "+modelLong+"Covar44=b.EXT_COVAR_03_03, \ - "+modelLong+"Covar45=b.EXT_COVAR_03_04, \ - "+modelLong+"Covar46=b.EXT_COVAR_03_05, \ - "+modelLong+"Covar47=b.EXT_COVAR_03_06, \ - "+modelLong+"Covar55=b.EXT_COVAR_04_04, \ - "+modelLong+"Covar56=b.EXT_COVAR_04_05, \ - "+modelLong+"Covar57=b.EXT_COVAR_04_06, \ - "+modelLong+"Covar66=b.EXT_COVAR_05_05, \ - "+modelLong+"Covar67=b.EXT_COVAR_05_06, \ - "+modelLong+"Covar77=b.EXT_COVAR_06_06 \ + "+model+"Phi=b.EXT_THETA \ + "+ext_covar_sql+" \ WHERE a.ippDetectID=b.IPP_IDET AND b.MODEL_TYPE = '"+ippModelType+"'" + print sql self.scratchDb.execute(sql) # sersic fit has an extra parameter - if ippModelType == "PS_MODEL_SERSIC": + if (ippModelType == "PS_MODEL_SERSIC" and hasResult > 0): sql = "UPDATE StackModelFit AS a, SkyChip_xfit AS b SET \ "+modelLong+"Covar18=b.EXT_COVAR_00_07, \