IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36252


Ignore:
Timestamp:
Oct 28, 2013, 4:40:06 PM (13 years ago)
Author:
eugene
Message:

merge changes from trunk (dvopsps photcode & time ranges)

Location:
branches/eam_branches/ipp-20130904/ippToPsps
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20130904/ippToPsps

  • branches/eam_branches/ipp-20130904/ippToPsps/config/changes.txt

    r35994 r36252  
    55
    66
     7alter table skychunk add trange_start timestamp after ST_cmf_version;
     8alter table skychunk add trange_end timestamp after trange_start;                   
     9
    710-- not yet alter table batch add column smf_version varchar(16) after comment;

  • branches/eam_branches/ipp-20130904/ippToPsps/config/ippToPspsDbSchema.sql

    r35994 r36252  
    129129  `P2_smf_version` varchar(16) default NULL,
    130130  `ST_cmf_version` varchar(16) default NULL,
     131  `trange_start`  timestamp NOT NULL default '0000-00-00 00:00:00',
     132  `trange_end` timestamp NOT NULL default '0000-00-00 00:00:00', 
    131133  UNIQUE KEY `name` (`name`)
    132134) ENGINE=InnoDB DEFAULT CHARSET=latin1;

  • branches/eam_branches/ipp-20130904/ippToPsps/config/settings.xml

    r35656 r36252  
    4343      <password>dvo</password>
    4444      <memory>16</memory>
     45    </loader>
     46    <loader mach="ipp011">
     47      <name>ipptopsps_scratch</name>
     48      <host>ipp011</host>
     49      <user>dvo</user>
     50      <password>dvo</password>
     51      <memory>16</memory>
     52    </loader>
     53
     54    <loader mach="ipp012">
     55      <name>ipptopsps_scratch</name>
     56      <host>ipp012</host>
     57      <user>dvo</user>
     58      <password>dvo</password>
     59      <memory>16</memory>
     60    </loader>
     61
     62
     63
     64    <loader mach="ipp013">
     65      <name>ipptopsps_scratch</name>
     66      <host>ipp013</host>
     67      <user>dvo</user>
     68      <password>dvo</password>
     69      <memory>32</memory>
     70    </loader>
     71
     72    <loader mach="ipp014">
     73      <name>ipptopsps_scratch</name>
     74      <host>ipp014</host>
     75      <user>dvo</user>
     76      <password>dvo</password>
     77      <memory>16</memory>
     78    </loader>
     79
     80    <loader mach="ipp015">
     81      <name>ipptopsps_scratch</name>
     82      <host>ipp015</host>
     83      <user>dvo</user>
     84      <password>dvo</password>
     85      <memory>20</memory>
     86    </loader>
     87    <loader mach="ipp016">
     88      <name>ipptopsps_scratch</name>
     89      <host>ipp016</host>
     90      <user>dvo</user>
     91      <password>dvo</password>
     92      <memory>16</memory>
     93    </loader>
     94    <loader mach="ipp018">
     95      <name>ipptopsps_scratch</name>
     96      <host>ipp018</host>
     97      <user>dvo</user>
     98      <password>dvo</password>
     99      <memory>16</memory>
     100    </loader>
     101
     102    <loader mach="ipp019">
     103      <name>ipptopsps_scratch</name>
     104      <host>ipp019</host>
     105      <user>dvo</user>
     106      <password>dvo</password>
     107      <memory>16</memory>
     108    </loader>
     109
     110    <loader mach="ipp020">
     111      <name>ipptopsps_scratch</name>
     112      <host>ipp020</host>
     113      <user>dvo</user>
     114      <password>dvo</password>
     115      <memory>16</memory>
     116    </loader>
     117    <loader mach="ipp021">
     118      <name>ipptopsps_scratch</name>
     119      <host>ipp021</host>
     120      <user>dvo</user>
     121      <password>dvo</password>
     122      <memory>16</memory>
     123    </loader>
     124
     125    <loader mach="ipp025">
     126      <name>ipptopsps_scratch</name>
     127      <host>ipp025</host>
     128      <user>dvo</user>
     129      <password>dvo</password>
     130      <memory>16</memory>
     131    </loader>
     132
     133
     134
     135
     136   <loader mach="ipp037">
     137      <name>ipptopsps_scratch</name>
     138      <host>ipp037</host>
     139      <user>dvo</user>
     140      <password>dvo</password>
     141      <memory>16</memory>
     142    </loader>
     143
     144
     145    <loader mach="ipp038">
     146      <name>ipptopsps_scratch</name>
     147      <host>ipp038</host>
     148      <user>dvo</user>
     149      <password>dvo</password>
     150      <memory>20</memory>
     151    </loader>
     152    <loader mach="ipp039">
     153      <name>ipptopsps_scratch</name>
     154      <host>ipp039</host>
     155      <user>dvo</user>
     156      <password>dvo</password>
     157      <memory>20</memory>
     158    </loader>
     159
     160
     161    <loader mach="ipp040">
     162      <name>ipptopsps_scratch</name>
     163      <host>ipp040</host>
     164      <user>dvo</user>
     165      <password>dvo</password>
     166      <memory>20</memory>
     167    </loader>
     168    <loader mach="ipp041">
     169      <name>ipptopsps_scratch</name>
     170      <host>ipp041</host>
     171      <user>dvo</user>
     172      <password>dvo</password>
     173      <memory>20</memory>
     174    </loader>
     175    <loader mach="ipp042">
     176      <name>ipptopsps_scratch</name>
     177      <host>ipp042</host>
     178      <user>dvo</user>
     179      <password>dvo</password>
     180      <memory>20</memory>
     181    </loader>
     182    <loader mach="ipp043">
     183      <name>ipptopsps_scratch</name>
     184      <host>ipp043</host>
     185      <user>dvo</user>
     186      <password>dvo</password>
     187      <memory>20</memory>
     188    </loader>
     189    <loader mach="ipp044">
     190      <name>ipptopsps_scratch</name>
     191      <host>ipp044</host>
     192      <user>dvo</user>
     193      <password>dvo</password>
     194      <memory>20</memory>
    45195    </loader>
    46196    <loader mach="ipp045">

  • branches/eam_branches/ipp-20130904/ippToPsps/jython/batch.py

    r35496 r36252  
    412412          if not match: continue
    413413          self.logger.debugPair("Reading IPP table", table.name)
     414          table = stilts.tpipe(table, cmd='addcol table_index $0')
     415
    414416          table = stilts.tpipe(table, cmd='explodeall')
    415417

  • branches/eam_branches/ipp-20130904/ippToPsps/jython/dvo.py

    r35780 r36252  
    518518          self.logger.debugPair("Reading IPP table", table.name)
    519519          table = stilts.tpipe(table, cmd='explodeall')
    520      
     520          #adds an index to all the tables
     521       #   table = stilts.tpipe(table, cmd='addcol table_index $0')
     522
    521523          # IPP FITS files are littered with infinity values. Remove them
    522524          self.logger.debugPair("Removing", "infinity values")
    … …  
    628630        maxDEC = boxDim['maxDEC'] + dD_border
    629631
     632        #find out if we use a time_range or not
     633        valid_trange_start = 0
     634        valid_trange_end = 0
     635        use_trange = 0
     636        if (self.skychunk.trange_start != '0000-00-00 00:00:00'):
     637            valid_trange_start = 1
     638        if (self.skychunk.trange_end != '0000-00-00 00:00:00'):
     639            valid_trange_end = 1             
     640
     641        if (valid_trange_start and valid_trange_end):
     642            use_trange = 1
     643
     644
    630645        # TODO path to DVO prog hardcoded temporarily
    631646        cmd = "dvopsps detections"
    … …  
    644659            cmd += " -parallel"
    645660
     661        if use_trange:
     662            # make tranges valid for dvopsps
     663            time_start1 = self.skychunk.trange_start
     664            time_end1 = self.skychunk.trange_end
     665            time_start=re.sub('\s+',',',time_start1)
     666            time_end=re.sub('\s+',',',time_end1)
     667           
     668            # make command
     669            cmd += " -time-start " + time_start
     670            cmd += " -time-end " + time_end
     671   
    646672        self.logger.infoPair("Running dvopsps", cmd)
    647673        p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)

  • branches/eam_branches/ipp-20130904/ippToPsps/jython/gpc1db.py

    r35994 r36252  
    4949    NB this uses Bill's potentially temporary 'skycells' database when finding RA/Dec for stacks.
    5050    '''
    51     def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
     51    def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999, tstart="0000-00-00 00:00:00", tend = "0000-00-00 00:00:00"):
    5252
    5353        self.logger.debugPair("GPC1 RA range", "%.2f -> %.2f" % (minRA, maxRA))
    5454        self.logger.debugPair("GPC1 Dec range", "%.2f -> %.2f" % (minDec, maxDec))
    55 
     55       
    5656        rows = []
    5757
    … …  
    8080                   AND addRun.state = 'full' \
    8181                   AND decl BETWEEN RADIANS(" + str(minDec) + ") AND RADIANS(" + str(maxDec) + ") \
    82                    AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ")"
     82                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ") \
     83                   AND dateobs >= '" + tstart + "'\
     84                   AND dateobs <= '" + tend  + "'"
    8385
    8486        elif batchType == "ST":       

  • branches/eam_branches/ipp-20130904/ippToPsps/jython/ipptopspsdb.py

    r36192 r36252  
    11191119        ,P2_smf_version \
    11201120        ,ST_cmf_version \
     1121        ,trange_start \
     1122        ,trange_end \
    11211123        FROM skychunk \
    11221124        WHERE name = '" + self.skychunk.name + "'"
    … …  
    11671169            self.skychunk.P2_smf_version = rs.getString(23)
    11681170            self.skychunk.ST_cmf_version = rs.getString(24)
     1171            self.skychunk.trange_start = rs.getString(25)
     1172            self.skychunk.trange_end = rs.getString(26)
    11691173
    11701174            if self.skychunk.parallel: print "USING parallel"

  • branches/eam_branches/ipp-20130904/ippToPsps/jython/queue.py

    r35994 r36252  
    9898                            self.skychunk.maxRa,
    9999                            self.skychunk.minDec,
    100                             self.skychunk.maxDec)
     100                            self.skychunk.maxDec,
     101                            self.skychunk.trange_start,
     102                            self.skychunk.trange_end)
    101103
    102104                # EAM TEST I/O

  • branches/eam_branches/ipp-20130904/ippToPsps/jython/stackbatch.py

    r36192 r36252  
    243243            cnt=cnt+1
    244244           
    245         sql=sql+"WHERE a.ippDetectID=b.IPP_IDET AND b.PSF_FWHM "+psfCondition     
     245        sql=sql+"WHERE a.ippDetectID=b.IPP_IDET AND "+psfCondition     
    246246        self.scratchDb.execute(sql)
    247247
    … …  
    633633
    634634        # TODO temporarily loading 1st convolved fluxes into unconvolved fields
     635
     636        #This assumes that there are 3 different fluxs, the first is unconv, and the 2nd and 3rd are convolved. If there are more than 3 fluxes it will break.   
     637        # If there are more than 3 types of fluxes, we should do a count to find out how many there are and adjust this accordingly (make it more robust)
     638
    635639        self.logger.infoPair("Adding fluxes", "un-convolved")
    636         self.updateApFlxs("", "IS NULL")
     640        self.updateApFlxs("", "((b.table_index -1) % 3 = 0)")
    637641        self.logger.infoPair("Adding fluxes", "1st convolved")
    638         self.updateApFlxs("c1", "< 7.0")
     642        self.updateApFlxs("c1", "((b.table_index -1) % 3 = 1)")
    639643        self.logger.infoPair("Adding fluxes", "2nd convolved")
    640         self.updateApFlxs("c2", "> 7.0")
     644        self.updateApFlxs("c2", "((b.table_index -1) % 3 = 2)")
    641645
    642646        self.logger.infoPair("Adding", "petrosians for extended sources")

  • branches/eam_branches/ipp-20130904/ippToPsps/perl/Makefile.am

    r35216 r36252  
    1 bin_SCRIPTS = checkOdmStatus.pl convertPhotCodesToXml.pl deleteFromDXLayer.pl pspsSchema2xml.pl
     1bin_SCRIPTS = checkOdmStatus.pl convertPhotCodesToXml.pl deleteFromDXLayer.pl pspsSchema2xml.pl deleteFromDXLayer2.pl
    22
    33INSTALL = @INSTALL@ -C

  • branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer.pl

    r32930 r36252  
    1919
    2020my $dxWebServiceUrl = "http://lsb01.psps.ifa.hawaii.edu/cgi-bin/dxlayer/dxwebservice.cgi";
     21#my $dxWebServiceUrl2 = "http://lsb02.psps.ifa.hawaii.edu/cgi-bin/dxlayer/dxwebservice.cgi";
     22
    2123#my $dxWebServiceUrl = "http://166.122.172.121/cgi-bin/dxlayer/dxwebservice.cgi";
    2224my $ua = LWP::UserAgent->new;
Note: See TracChangeset for help on using the changeset viewer.