Index: /branches/eam_branches/ipp-20130904/ippToPsps/config/changes.txt
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/config/changes.txt (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/config/changes.txt (revision 36252)
@@ -5,3 +5,6 @@
+alter table skychunk add trange_start timestamp after ST_cmf_version;
+alter table skychunk add trange_end timestamp after trange_start;
+
-- not yet alter table batch add column smf_version varchar(16) after comment;
Index: /branches/eam_branches/ipp-20130904/ippToPsps/config/ippToPspsDbSchema.sql
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/config/ippToPspsDbSchema.sql (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/config/ippToPspsDbSchema.sql (revision 36252)
@@ -129,4 +129,6 @@
`P2_smf_version` varchar(16) default NULL,
`ST_cmf_version` varchar(16) default NULL,
+ `trange_start` timestamp NOT NULL default '0000-00-00 00:00:00',
+ `trange_end` timestamp NOT NULL default '0000-00-00 00:00:00',
UNIQUE KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
Index: /branches/eam_branches/ipp-20130904/ippToPsps/config/settings.xml
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/config/settings.xml (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/config/settings.xml (revision 36252)
@@ -43,4 +43,154 @@
dvo
16
+
+
+ ipptopsps_scratch
+ ipp011
+ dvo
+ dvo
+ 16
+
+
+
+ ipptopsps_scratch
+ ipp012
+ dvo
+ dvo
+ 16
+
+
+
+
+
+ ipptopsps_scratch
+ ipp013
+ dvo
+ dvo
+ 32
+
+
+
+ ipptopsps_scratch
+ ipp014
+ dvo
+ dvo
+ 16
+
+
+
+ ipptopsps_scratch
+ ipp015
+ dvo
+ dvo
+ 20
+
+
+ ipptopsps_scratch
+ ipp016
+ dvo
+ dvo
+ 16
+
+
+ ipptopsps_scratch
+ ipp018
+ dvo
+ dvo
+ 16
+
+
+
+ ipptopsps_scratch
+ ipp019
+ dvo
+ dvo
+ 16
+
+
+
+ ipptopsps_scratch
+ ipp020
+ dvo
+ dvo
+ 16
+
+
+ ipptopsps_scratch
+ ipp021
+ dvo
+ dvo
+ 16
+
+
+
+ ipptopsps_scratch
+ ipp025
+ dvo
+ dvo
+ 16
+
+
+
+
+
+
+ ipptopsps_scratch
+ ipp037
+ dvo
+ dvo
+ 16
+
+
+
+
+ ipptopsps_scratch
+ ipp038
+ dvo
+ dvo
+ 20
+
+
+ ipptopsps_scratch
+ ipp039
+ dvo
+ dvo
+ 20
+
+
+
+
+ ipptopsps_scratch
+ ipp040
+ dvo
+ dvo
+ 20
+
+
+ ipptopsps_scratch
+ ipp041
+ dvo
+ dvo
+ 20
+
+
+ ipptopsps_scratch
+ ipp042
+ dvo
+ dvo
+ 20
+
+
+ ipptopsps_scratch
+ ipp043
+ dvo
+ dvo
+ 20
+
+
+ ipptopsps_scratch
+ ipp044
+ dvo
+ dvo
+ 20
Index: /branches/eam_branches/ipp-20130904/ippToPsps/jython/batch.py
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/jython/batch.py (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/jython/batch.py (revision 36252)
@@ -412,4 +412,6 @@
if not match: continue
self.logger.debugPair("Reading IPP table", table.name)
+ table = stilts.tpipe(table, cmd='addcol table_index $0')
+
table = stilts.tpipe(table, cmd='explodeall')
Index: /branches/eam_branches/ipp-20130904/ippToPsps/jython/dvo.py
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/jython/dvo.py (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/jython/dvo.py (revision 36252)
@@ -518,5 +518,7 @@
self.logger.debugPair("Reading IPP table", table.name)
table = stilts.tpipe(table, cmd='explodeall')
-
+ #adds an index to all the tables
+ # table = stilts.tpipe(table, cmd='addcol table_index $0')
+
# IPP FITS files are littered with infinity values. Remove them
self.logger.debugPair("Removing", "infinity values")
@@ -628,4 +630,17 @@
maxDEC = boxDim['maxDEC'] + dD_border
+ #find out if we use a time_range or not
+ valid_trange_start = 0
+ valid_trange_end = 0
+ use_trange = 0
+ if (self.skychunk.trange_start != '0000-00-00 00:00:00'):
+ valid_trange_start = 1
+ if (self.skychunk.trange_end != '0000-00-00 00:00:00'):
+ valid_trange_end = 1
+
+ if (valid_trange_start and valid_trange_end):
+ use_trange = 1
+
+
# TODO path to DVO prog hardcoded temporarily
cmd = "dvopsps detections"
@@ -644,4 +659,15 @@
cmd += " -parallel"
+ if use_trange:
+ # make tranges valid for dvopsps
+ time_start1 = self.skychunk.trange_start
+ time_end1 = self.skychunk.trange_end
+ time_start=re.sub('\s+',',',time_start1)
+ time_end=re.sub('\s+',',',time_end1)
+
+ # make command
+ cmd += " -time-start " + time_start
+ cmd += " -time-end " + time_end
+
self.logger.infoPair("Running dvopsps", cmd)
p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
Index: /branches/eam_branches/ipp-20130904/ippToPsps/jython/gpc1db.py
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/jython/gpc1db.py (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/jython/gpc1db.py (revision 36252)
@@ -49,9 +49,9 @@
NB this uses Bill's potentially temporary 'skycells' database when finding RA/Dec for stacks.
'''
- def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
+ 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"):
self.logger.debugPair("GPC1 RA range", "%.2f -> %.2f" % (minRA, maxRA))
self.logger.debugPair("GPC1 Dec range", "%.2f -> %.2f" % (minDec, maxDec))
-
+
rows = []
@@ -80,5 +80,7 @@
AND addRun.state = 'full' \
AND decl BETWEEN RADIANS(" + str(minDec) + ") AND RADIANS(" + str(maxDec) + ") \
- AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ")"
+ AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ") \
+ AND dateobs >= '" + tstart + "'\
+ AND dateobs <= '" + tend + "'"
elif batchType == "ST":
Index: /branches/eam_branches/ipp-20130904/ippToPsps/jython/ipptopspsdb.py
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/jython/ipptopspsdb.py (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/jython/ipptopspsdb.py (revision 36252)
@@ -1119,4 +1119,6 @@
,P2_smf_version \
,ST_cmf_version \
+ ,trange_start \
+ ,trange_end \
FROM skychunk \
WHERE name = '" + self.skychunk.name + "'"
@@ -1167,4 +1169,6 @@
self.skychunk.P2_smf_version = rs.getString(23)
self.skychunk.ST_cmf_version = rs.getString(24)
+ self.skychunk.trange_start = rs.getString(25)
+ self.skychunk.trange_end = rs.getString(26)
if self.skychunk.parallel: print "USING parallel"
Index: /branches/eam_branches/ipp-20130904/ippToPsps/jython/queue.py
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/jython/queue.py (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/jython/queue.py (revision 36252)
@@ -98,5 +98,7 @@
self.skychunk.maxRa,
self.skychunk.minDec,
- self.skychunk.maxDec)
+ self.skychunk.maxDec,
+ self.skychunk.trange_start,
+ self.skychunk.trange_end)
# EAM TEST I/O
Index: /branches/eam_branches/ipp-20130904/ippToPsps/jython/stackbatch.py
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/jython/stackbatch.py (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/jython/stackbatch.py (revision 36252)
@@ -243,5 +243,5 @@
cnt=cnt+1
- sql=sql+"WHERE a.ippDetectID=b.IPP_IDET AND b.PSF_FWHM "+psfCondition
+ sql=sql+"WHERE a.ippDetectID=b.IPP_IDET AND "+psfCondition
self.scratchDb.execute(sql)
@@ -633,10 +633,14 @@
# TODO temporarily loading 1st convolved fluxes into unconvolved fields
+
+ #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.
+ # 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)
+
self.logger.infoPair("Adding fluxes", "un-convolved")
- self.updateApFlxs("", "IS NULL")
+ self.updateApFlxs("", "((b.table_index -1) % 3 = 0)")
self.logger.infoPair("Adding fluxes", "1st convolved")
- self.updateApFlxs("c1", "< 7.0")
+ self.updateApFlxs("c1", "((b.table_index -1) % 3 = 1)")
self.logger.infoPair("Adding fluxes", "2nd convolved")
- self.updateApFlxs("c2", "> 7.0")
+ self.updateApFlxs("c2", "((b.table_index -1) % 3 = 2)")
self.logger.infoPair("Adding", "petrosians for extended sources")
Index: /branches/eam_branches/ipp-20130904/ippToPsps/perl/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/perl/Makefile.am (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/perl/Makefile.am (revision 36252)
@@ -1,3 +1,3 @@
-bin_SCRIPTS = checkOdmStatus.pl convertPhotCodesToXml.pl deleteFromDXLayer.pl pspsSchema2xml.pl
+bin_SCRIPTS = checkOdmStatus.pl convertPhotCodesToXml.pl deleteFromDXLayer.pl pspsSchema2xml.pl deleteFromDXLayer2.pl
INSTALL = @INSTALL@ -C
Index: /branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer.pl
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer.pl (revision 36251)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer.pl (revision 36252)
@@ -19,4 +19,6 @@
my $dxWebServiceUrl = "http://lsb01.psps.ifa.hawaii.edu/cgi-bin/dxlayer/dxwebservice.cgi";
+#my $dxWebServiceUrl2 = "http://lsb02.psps.ifa.hawaii.edu/cgi-bin/dxlayer/dxwebservice.cgi";
+
#my $dxWebServiceUrl = "http://166.122.172.121/cgi-bin/dxlayer/dxwebservice.cgi";
my $ua = LWP::UserAgent->new;
Index: /branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer2.pl
===================================================================
--- /branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer2.pl (revision 36252)
+++ /branches/eam_branches/ipp-20130904/ippToPsps/perl/deleteFromDXLayer2.pl (revision 36252)
@@ -0,0 +1,63 @@
+#!/usr/bin/env perl
+
+use warnings;
+use strict;
+
+use LWP::UserAgent;
+use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
+use XML::LibXML;
+use File::Temp qw(tempfile);
+
+
+my $batchName = undef;
+my $file = undef;
+
+GetOptions(
+ 'batch|b=s' => \$batchName,
+ 'file|f=s' => \$file,
+ );
+
+my $dxWebServiceUrl = "http://lsb02.psps.ifa.hawaii.edu/cgi-bin/dxlayer/dxwebservice.cgi";
+#my $dxWebServiceUrl2 = "http://lsb02.psps.ifa.hawaii.edu/cgi-bin/dxlayer/dxwebservice.cgi";
+
+#my $dxWebServiceUrl = "http://166.122.172.121/cgi-bin/dxlayer/dxwebservice.cgi";
+my $ua = LWP::UserAgent->new;
+$ua->timeout(15);
+$ua->env_proxy;
+
+ my $doc = XML::LibXML::Document->new(); # Global document variable.
+ my $rootNode = $doc->createElement('AdminQueryParams');
+$doc->setDocumentElement($rootNode);
+
+my $paramNode = $doc->createElement('Param');
+$paramNode->setAttribute('Name', "BatchID"); # default FirstRow is 1
+my $text=XML::LibXML::Text->new($batchName);
+$paramNode->appendChild($text); #append
+$rootNode->appendChild($paramNode); # append a node to the xml tree
+
+my $xmlParams = $doc->toString;
+
+print $xmlParams;
+
+my $response = $ua->post($dxWebServiceUrl,
+ [op => "delete_dxbatch_files",
+ xmlParams => $xmlParams ]
+ );
+
+# '200' is the 'OK' response
+if ($response->code != 200) {
+
+ print "Problem connecting to DXLayerweb service, HTTP response status: ".$response->status_line."\n";
+ exit(1);
+}
+
+open (DAT, ">".$file);
+print DAT $response->content;
+
+
+print "$file\n";
+
+exit(0);
+
+
+