Index: /trunk/ippToPsps/config/settings.xml
===================================================================
--- /trunk/ippToPsps/config/settings.xml	(revision 36189)
+++ /trunk/ippToPsps/config/settings.xml	(revision 36190)
@@ -43,4 +43,154 @@
       <password>dvo</password>
       <memory>16</memory>
+    </loader>
+    <loader mach="ipp011">
+      <name>ipptopsps_scratch</name>
+      <host>ipp011</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+    <loader mach="ipp012">
+      <name>ipptopsps_scratch</name>
+      <host>ipp012</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+
+
+    <loader mach="ipp013">
+      <name>ipptopsps_scratch</name>
+      <host>ipp013</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>32</memory>
+    </loader>
+
+    <loader mach="ipp014">
+      <name>ipptopsps_scratch</name>
+      <host>ipp014</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+    <loader mach="ipp015">
+      <name>ipptopsps_scratch</name>
+      <host>ipp015</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+    <loader mach="ipp016">
+      <name>ipptopsps_scratch</name>
+      <host>ipp016</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+    <loader mach="ipp018">
+      <name>ipptopsps_scratch</name>
+      <host>ipp018</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+    <loader mach="ipp019">
+      <name>ipptopsps_scratch</name>
+      <host>ipp019</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+    <loader mach="ipp020">
+      <name>ipptopsps_scratch</name>
+      <host>ipp020</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+    <loader mach="ipp021">
+      <name>ipptopsps_scratch</name>
+      <host>ipp021</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+    <loader mach="ipp025">
+      <name>ipptopsps_scratch</name>
+      <host>ipp025</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+
+
+
+   <loader mach="ipp037">
+      <name>ipptopsps_scratch</name>
+      <host>ipp037</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>16</memory>
+    </loader>
+
+
+    <loader mach="ipp038">
+      <name>ipptopsps_scratch</name>
+      <host>ipp038</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+    <loader mach="ipp039">
+      <name>ipptopsps_scratch</name>
+      <host>ipp039</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+
+
+    <loader mach="ipp040">
+      <name>ipptopsps_scratch</name>
+      <host>ipp040</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+    <loader mach="ipp041">
+      <name>ipptopsps_scratch</name>
+      <host>ipp041</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+    <loader mach="ipp042">
+      <name>ipptopsps_scratch</name>
+      <host>ipp042</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+    <loader mach="ipp043">
+      <name>ipptopsps_scratch</name>
+      <host>ipp043</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
+    </loader>
+    <loader mach="ipp044">
+      <name>ipptopsps_scratch</name>
+      <host>ipp044</host>
+      <user>dvo</user>
+      <password>dvo</password>
+      <memory>20</memory>
     </loader>
     <loader mach="ipp045">
Index: /trunk/ippToPsps/jython/batch.py
===================================================================
--- /trunk/ippToPsps/jython/batch.py	(revision 36189)
+++ /trunk/ippToPsps/jython/batch.py	(revision 36190)
@@ -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: /trunk/ippToPsps/jython/dvo.py
===================================================================
--- /trunk/ippToPsps/jython/dvo.py	(revision 36189)
+++ /trunk/ippToPsps/jython/dvo.py	(revision 36190)
@@ -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")
Index: /trunk/ippToPsps/jython/stackbatch.py
===================================================================
--- /trunk/ippToPsps/jython/stackbatch.py	(revision 36189)
+++ /trunk/ippToPsps/jython/stackbatch.py	(revision 36190)
@@ -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: /trunk/ippToPsps/perl/Makefile.am
===================================================================
--- /trunk/ippToPsps/perl/Makefile.am	(revision 36189)
+++ /trunk/ippToPsps/perl/Makefile.am	(revision 36190)
@@ -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: /trunk/ippToPsps/perl/deleteFromDXLayer.pl
===================================================================
--- /trunk/ippToPsps/perl/deleteFromDXLayer.pl	(revision 36189)
+++ /trunk/ippToPsps/perl/deleteFromDXLayer.pl	(revision 36190)
@@ -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;