IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39785 for trunk


Ignore:
Timestamp:
Oct 21, 2016, 11:24:05 AM (10 years ago)
Author:
heather
Message:

first steps for gaia object batches

Location:
trunk/ippToPsps
Files:
3 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/config/Makefile.am

    r39010 r39785  
    1010  tables.FO.vot \
    1111  tables.FG.vot \
     12  tables.GO.vot \
    1213  settings.xml
    1314

  • trunk/ippToPsps/config/ippToPspsDbSchema.sql

    r38823 r39785  
    111111  `queue_FW` tinyint(1) default '0',
    112112  `queue_FO` tinyint(1) default '0',
     113  `queue_FG` tinyint(1) default '0',   
     114  `queue_GO` tinyint(1) default '0',
    113115  `active` tinyint(1) default '1',
    114116  `parallel` tinyint(1) default '0',

  • trunk/ippToPsps/jython/batch.py

    r39315 r39785  
    700700        # for OB, this imports object data from DVO
    701701        if not self.importIppTables():
    702             if (self.batchType == "OB" or self.batchType =="DO" or self.batchType =="FO" or self.batchType =="FG"):
     702            if (self.batchType == "OB" or self.batchType =="DO" or self.batchType =="FO" or self.batchType =="FG" or self.batchType =="GO"):
    703703                self.logger.errorPair("skipping this batch", "no dvo tables for this region")
    704704                self.ippToPspsDb.updateProcessed(self.batchID, 1)

  • trunk/ippToPsps/jython/cleanup.py

    r39154 r39785  
    5151            self.clean("FO")
    5252            self.clean("FG")
     53            self.clean("GO")
    5354
    5455            self.checkClientStatus()

  • trunk/ippToPsps/jython/insert.dvodb.info.py

    r38884 r39785  
    8383                # XXX : need to fix 'dvo.setSkyArea' or this may not return the full list for a parallel dvo
    8484            #for object-like batches, info comes from dvo
    85                 if (batchType == "OB" or batchType =="DO" or batchType =="FO"):
     85                if (batchType == "OB" or batchType =="DO" or batchType =="FO" or batchType == "FG" or batchType == "GO"):
    8686                    self.dvoObjects.setSkyArea(
    8787                            self.skychunk.minRa,

  • trunk/ippToPsps/jython/ipptopspsdb.py

    r39764 r39785  
    819819
    820820        sql = "INSERT INTO diffobject ( \
     821               batch_id \
     822               ,region \
     823               ) VALUES ( \
     824               " + str(batchID) + " \
     825               ,'" + region + "' \
     826               )"
     827
     828        self.execute(sql)
     829
     830            '''
     831    Inserts some gaiaobject metadata for this batch ID
     832    '''
     833    def insertGaiaObjectMeta(self, batchID, region):
     834
     835        sql = "INSERT INTO gaiaobject ( \
    821836               batch_id \
    822837               ,region \
    … …  
    11041119        ,queue_FW \
    11051120        ,queue_FO \
     1121        ,queue_FG \
     1122        ,queue_GO \
    11061123        ,parallel \
    11071124        ,P2_smf_version \
    … …  
    11791196###        if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FG") fix this when P2 is done
    11801197        if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FO")
     1198        if rs.getInt(26) == 1: self.skychunk.batchTypes.append("FG")
     1199        if rs.getInt(27) == 1: self.skychunk.batchTypes.append("GO")
     1200       
    11811201
    11821202        self.skychunk.force = True # TODO
    11831203        self.skychunk.parallel = False # TODO
    11841204
    1185         if rs.getInt(26) == 1: self.skychunk.parallel = True
    1186         self.skychunk.P2_smf_version = rs.getString(27)
     1205        if rs.getInt(28) == 1: self.skychunk.parallel = True
     1206        self.skychunk.P2_smf_version = rs.getString(29)
    11871207        # options: "use_new", "not_reproc", "use_original"
    11881208
    1189         self.skychunk.ST_cmf_version = rs.getString(28)
     1209        self.skychunk.ST_cmf_version = rs.getString(30)
    11901210        # options: not used?
    11911211
    … …  
    12121232        # print "typename: " + rsmd.getColumnTypeName(16)
    12131233
    1214         self.skychunk.trange_start = rs.getString(29)
     1234        self.skychunk.trange_start = rs.getString(31)
    12151235        # options: "YYYY-MM-DD,HH:MM:SS" or "0000-00-00 00:00:00"
    12161236
    1217         self.skychunk.trange_end = rs.getString(30)
     1237        self.skychunk.trange_end = rs.getString(32)
    12181238        # options: "YYYY-MM-DD,HH:MM:SS" or "0000-00-00 00:00:00"
    12191239

  • trunk/ippToPsps/jython/loader.py

    r39507 r39785  
    302302                                              id,
    303303                                              batchID)
     304                elif batchType == "GO":
     305                    batch = GaiaObjectBatch(self.logger,
     306                                              self.config,
     307                                              self.skychunk,
     308                                              self.gpc1Db,
     309                                              self.ippToPspsDb,
     310                                              self.scratchDb,
     311                                              id,
     312                                              batchID)
    304313                   
    305314                batch.run()

  • trunk/ippToPsps/jython/metrics.py

    r38969 r39785  
    5353            rateFO = self.printStats("FO")
    5454            rateFG = self.printStats("FG")
     55            rateGO = self.printStats("GO")
    5556            self.logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
    5657       
    … …  
    7677            pendFOProcessed = self.printTableRow(stages, "FO")
    7778            pendFGProcessed = self.printTableRow(stages, "FG")
     79            pendGOProcessed = self.printTableRow(stages, "GO")
    7880            self.writeTableSeparator(colCount)
    7981
    … …  
    9395            try: self.logger.infoPair("Estimated time for FOs", "%.1f hours" % (pendFOProcessed / rateFO))
    9496            except: pass
    95             try: self.logger.infoPair("Estimated time for FGs", "%.1f hours" % (pendFGProcessed / rateFG))
     97            try: self.logger.infoPair("Estimated time for FGs", "%.1f hours" % (pendFGProcessed / rateFG))
     98            try: self.logger.infoPair("Estimated time for GOs", "%.1f hours" % (pendGOProcessed / rateGO))
    9699            except: pass
    97100       
    … …  
    107110            self.plot.createDensityPlot("FO", True)
    108111            self.plot.createDensityPlot("FG", True)
     112            self.plot.createDensityPlot("GO", True)
     113           
    109114            # some clean-up before going to sleep
    110115            self.ippToPspsDb.purgeDeadClients()

  • trunk/ippToPsps/jython/plotter.py

    r36697 r39785  
    3232            self.plot.createDensityPlot("FW")
    3333            self.plot.createDensityPlot("FO")
     34            self.plot.createDensityPlot("FG")
     35            self.plot.createDensityPlot("GO")
     36           
    3437
    3538    '''

  • trunk/ippToPsps/jython/pollOdm.py

    r38969 r39785  
    4242        else: self.stages = [self.STAGE]
    4343
    44         if self.BATCHTYPE == "all": self.batchTypes = ['IN', 'P2', 'ST', 'OB', 'DF', 'DO', 'FW', 'FO', 'FG']
     44        if self.BATCHTYPE == "all": self.batchTypes = ['IN', 'P2', 'ST', 'OB', 'DF', 'DO', 'FW', 'FO', 'FG', 'GO']
    4545        else: self.batchTypes = [self.BATCHTYPE]
    4646
    … …  
    126126    '''
    127127    def printUsage(self):
    128         super(PollOdm, self).printUsage("<IN|P2|ST|OB|DF|DO|FW|FO|FG|all> <unloaded|unmergeworthy|unmerged|all> [hours]")
     128        super(PollOdm, self).printUsage("<IN|P2|ST|OB|DF|DO|FW|FO|FG|GO|all> <unloaded|unmergeworthy|unmerged|all> [hours]")
    129129   
    130130   

  • trunk/ippToPsps/jython/queue.py

    r39159 r39785  
    7373
    7474                # for object-like batches, info comes from dvo
    75                 if (batchType == "OB" or batchType =="DO" or batchType =="FO" or batchType == "FG"):
     75                if (batchType == "OB" or batchType =="DO" or batchType =="FO" or batchType == "FG" or batchType == "GO"):
    7676                    self.dvoObjects.setSkyArea(
    7777                            self.skychunk.minRa,
Note: See TracChangeset for help on using the changeset viewer.