Changeset 33949

Timestamp:

May 29, 2012, 5:08:07 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405

Files:

• Nebulous-Server/bin/neb-admin (modified) (1 diff)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (1 diff)
• ippMonitor (modified) (1 prop)
• ippMonitor/Makefile.in (modified) (2 diffs)
• ippMonitor/czartool/czarpoll.pl (modified) (2 diffs)
• ippMonitor/czartool/czartool.pl (modified) (8 diffs)
• ippMonitor/czartool/czartool/CzarDb.pm (modified) (2 diffs)
• ippMonitor/czartool/czartool/DayMetrics.pm (modified) (9 diffs)
• ippMonitor/czartool/czartool/Gpc1Db.pm (modified) (4 diffs)
• ippMonitor/czartool/czartool/Plotter.pm (modified) (2 diffs)
• ippMonitor/czartool/roboczar.pl (modified) (1 diff)
• ippMonitor/def/addRunRun.d (modified) (1 diff)
• ippMonitor/def/addRunSummary.d (copied) (copied from trunk/ippMonitor/def/addRunSummary.d )
• ippMonitor/def/dvodbFaulted.d (copied) (copied from trunk/ippMonitor/def/dvodbFaulted.d )
• ippMonitor/def/dvodbStatus.d (copied) (copied from trunk/ippMonitor/def/dvodbStatus.d )
• ippMonitor/def/exposureStatus.d (modified) (1 diff)
• ippMonitor/def/gpc1MysqlProcessList.d (modified) (1 diff)
• ippMonitor/def/maskStats.d (modified) (1 diff)
• ippMonitor/def/mergedvodbCopy.d (copied) (copied from trunk/ippMonitor/def/mergedvodbCopy.d )
• ippMonitor/def/mergedvodbProcessed.d (copied) (copied from trunk/ippMonitor/def/mergedvodbProcessed.d )
• ippMonitor/def/mergedvodbRun.d (copied) (copied from trunk/ippMonitor/def/mergedvodbRun.d )
• ippMonitor/def/minidvodbProcessed.d (modified) (1 diff)
• ippMonitor/def/minidvodbRun.d (modified) (1 diff)
• ippMonitor/def/mopsStatus.d (modified) (1 diff)
• ippMonitor/def/warpProcessedSkyfiles_Images.d (modified) (1 diff)
• ippMonitor/raw/czartool_ipptopsps.php (modified) (2 diffs)
• ippMonitor/raw/czartool_labels.php (modified) (8 diffs)
• ippMonitor/raw/ipp.czar.dat (copied) (copied from trunk/ippMonitor/raw/ipp.czar.dat )
• ippMonitor/raw/ipp.czar.php (copied) (copied from trunk/ippMonitor/raw/ipp.czar.php )
• ippMonitor/raw/ipp.dvodb.dat (modified) (1 diff)
• ippMonitor/raw/ipp.menu.dat (modified) (1 diff)
• ippMonitor/raw/ipp.science.dat (modified) (1 diff)
• ippMonitor/raw/nightSummary.php (modified) (1 diff)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 diff, 1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/nightly_science.pl (modified) (4 diffs)
• ippScripts/scripts/staticsky.pl (modified) (2 diffs)
• ippTasks/pstamp.pro (modified) (4 diffs)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_pendingimfile.sql (modified) (1 diff)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pstamptool_revertreq_deletejobs.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/sctool_list.sql (copied) (copied from trunk/ippTools/share/sctool_list.sql )
• ippTools/share/staticskytool_definebyquery_inputs.sql (modified) (1 diff)
• ippTools/share/staticskytool_definebyquery_select.sql (modified) (2 diffs)
• ippTools/share/staticskytool_result.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/addtool.c (modified) (1 diff)
• ippTools/src/magictool.c (modified) (1 prop)
• ippTools/src/pstamptoolConfig.c (modified) (1 diff)
• ippTools/src/pxspace.c (modified) (1 diff)
• ippTools/src/pxspace.h (modified) (2 diffs)
• ippTools/src/sctool.c (modified) (3 diffs)
• ippTools/src/sctool.h (modified) (1 diff)
• ippTools/src/sctoolConfig.c (copied) (copied from trunk/ippTools/src/sctoolConfig.c )
• ippTools/src/stacktool.c (modified) (2 diffs)
• ippTools/src/stacktoolConfig.c (modified) (2 diffs)
• ippTools/src/staticskytool.c (modified) (5 diffs)
• ippTools/src/staticskytoolConfig.c (modified) (3 diffs)
• ppImage/src (modified) (1 prop)
• ppImage/src/ppImage.h (modified) (1 diff)
• ppImage/src/ppImageDetrendReadout.c (modified) (3 diffs)
• ppImage/src/ppImageOptions.c (modified) (3 diffs)
• ppImage/src/ppImageParseCamera.c (modified) (2 diffs)
• ppMerge/src/ppMergeCamera.c (modified) (2 diffs)
• psastro/src/psastroLoadCrosstalk.c (modified) (4 diffs)
• psastro/src/psastroLoadGhosts.c (modified) (3 diffs)
• psastro/src/psastroMaskUpdates.c (modified) (1 diff)
• psastro/src/psastroMaskUtils.c (modified) (1 diff)
• tools/czarcal (modified) (1 diff)
• tools/dlapstacks (modified) (1 diff)
• tools/heather/dvomergecheck.pl (copied) (copied from trunk/tools/heather/dvomergecheck.pl )
• tools/listcmf (copied) (copied from trunk/tools/listcmf )
• tools/repair_bad_instance (modified) (1 diff)
• tools/runbgchip.pl (modified) (1 diff)
• tools/runchipimfile.pl (modified) (1 diff)
• tools/runwarpskycell.pl (modified) (1 diff)

branches/eam_branches/ipp-20120405/Nebulous-Server/bin/neb-admin

@@ -625 +625 @@
 #   OFFSET $offset
 # ");
-    my $query = $dbh->prepare(
-        "
-SELECT Z.so_id,ext_id,Z.ins_id,Z.uri,substr(Z.uri,-10,5) AS class_id,Z.vol_id,vol_name,vol_host,
-       instance.vol_id AS  second_vol_id,volume.name AS second_name,volume.host AS second_host FROM (
-  SELECT S.so_id,ext_id,ins_id,uri,substr(uri,-10,5) AS class_id,vol_id,name AS vol_name,host AS vol_host,MAXins_id FROM (
-    select * FROM (
-      select MAX(ins_id) AS MAXins_id, MIN(ins_id) AS MINins_id, so_id,ext_id FROM storage_object
-        JOIN storage_object_xattr USING(so_id)
-        RIGHT JOIN instance USING(so_id)
-         WHERE name = 'user.copies'
-         AND value >= 2
-         AND ext_id LIKE '%ota%fits'
-         AND so_id >= $so_id_start
-         AND so_id <  $so_id_end
-         GROUP BY so_id
-      ) AS V
-      WHERE MAXins_id != MINins_id
-    ) AS S
-    JOIN instance ON (S.MINins_id = instance.ins_id AND S.so_id = instance.so_id)
-    JOIN volume USING(vol_id) WHERE volume.available = 1
-    AND volume.name AS $requested_source
-  ) AS Z
-JOIN instance ON (MAXins_id = instance.ins_id AND Z.so_id = instance.so_id)
-JOIN volume ON(instance.vol_id = volume.vol_id) WHERE volume.available = 1
-LIMIT $limit
-OFFSET $offset
-");
+    
+    print STDERR "This query is broken so I have disabled it to get the MHPCC->ATRC shuffle going.\n";
+    exit 0;
+    my $query;
+#     my $query = $dbh->prepare(
+#       "
+# SELECT Z.so_id,ext_id,Z.ins_id,Z.uri,substr(Z.uri,-10,5) AS class_id,Z.vol_id,vol_name,vol_host,
+#        instance.vol_id AS  second_vol_id,volume.name AS second_name,volume.host AS second_host FROM (
+#   SELECT S.so_id,ext_id,ins_id,uri,substr(uri,-10,5) AS class_id,vol_id,name AS vol_name,host AS vol_host,MAXins_id FROM (
+#     select * FROM (
+#       select MAX(ins_id) AS MAXins_id, MIN(ins_id) AS MINins_id, so_id,ext_id FROM storage_object
+#         JOIN storage_object_xattr USING(so_id)
+#         RIGHT JOIN instance USING(so_id)
+#          WHERE name = 'user.copies'
+#          AND value >= 2
+#          AND ext_id LIKE '%ota%fits'
+#          AND so_id >= $so_id_start
+#          AND so_id <  $so_id_end
+#          GROUP BY so_id
+#       ) AS V
+#       WHERE MAXins_id != MINins_id
+#     ) AS S
+#     JOIN instance ON (S.MINins_id = instance.ins_id AND S.so_id = instance.so_id)
+#     JOIN volume USING(vol_id) WHERE volume.available = 1
+#     AND volume.name AS $requested_source
+#   ) AS Z
+# JOIN instance ON (MAXins_id = instance.ins_id AND Z.so_id = instance.so_id)
+# JOIN volume ON(instance.vol_id = volume.vol_id) WHERE volume.available = 1
+# LIMIT $limit
+# OFFSET $offset
+# ");
 
     $query->execute();

branches/eam_branches/ipp-20120405/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -750 +750 @@
 ###
 
+CREATE TABLE lost_instances (
+    id BIGINT NOT NULL AUTO_INCREMENT,
+    ins_id BIGINT NOT NULL DEFAULT -1,
+    so_id BIGINT NOT NULL DEFAULT -1,
+    vol_id INT NOT NULL DEFAULT -1,
+    uri CHAR(255) NOT NULL DEFAULT 'undefined',
+    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    mtime TIMESTAMP,
+    PRIMARY KEY(id),
+    KEY(so_id),
+    KEY(vol_id),
+    KEY(uri(40))
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+###
+
 CREATE TABLE log (
     timestamp TIMESTAMP,

branches/eam_branches/ipp-20120405/ippMonitor/Makefile.in

@@ -47 +47 @@
 $(DESTWWW)/ipp.dvodb.dat \
 $(DESTWWW)/ipp.dvodb.php \
+$(DESTWWW)/ipp.czar.dat \
+$(DESTWWW)/ipp.czar.php \
 $(DESTWWW)/phptest.php \
 $(DESTWWW)/site.php \
@@ -222 +224 @@
 $(DESTWWW)/minidvodbCopy.php \
 $(DESTWWW)/minidvodbProcessed.php \
+$(DESTWWW)/mergedvodbRun.php \
+$(DESTWWW)/mergedvodbCopy.php \
+$(DESTWWW)/mergedvodbProcessed.php \
+$(DESTWWW)/dvodbStatus.php \
+$(DESTWWW)/dvodbFaulted.php \
 $(DESTWWW)/addRunRun.php \
 $(DESTWWW)/addRunProcessed.php \
+$(DESTWWW)/addRunSummary.php \
 $(DESTWWW)/lapSequenceSummary.php \
 $(DESTWWW)/lapRuns.php \

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czarpoll.pl

@@ -38 +38 @@
 
 my @stages = (
-        "burntool", 
         "chip", 
         "cam", 
@@ -44 +43 @@
         "warp", 
         "stack", 
+        "staticsky", 
         "diff", 
-        "magic", 
-        "magicDS", 
         "dist", 
-        "pub");
+        "pub",
+        "chipbackground");
 
 my @ippToPspsStages = (

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool.pl

@@ -32 +32 @@
 my @publishingLabels = undef;
 
-my @stages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist", "pub"); 
+my @stages = ("chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist", "pub", "chipbackground"); 
 promptPoll();
 
@@ -155 +155 @@
 
     chomp($label);
-
-    printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                                         %32s                                                     |\n", $label);
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
-    printf("|   state    |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    dist    |   publish  |\n");
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    my $stage;
+
+    printf("\n|  %32s  \n", $label);
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
+    printf("|   state    |");
+    foreach $stage (@stages) {
+
+        printf("%14s|", $stage)
+    }
+    printf("\n");
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
 
     my $state;
-    my $stage;
     my $i=0;
     foreach $state (@states) {
@@ -172 +184 @@
         foreach $stage (@stages) {
 
-            printf("| %10s ", getStateAndFaultsString($label, $state, $stage));
+            printf("|%14s", getStateAndFaultsString($label, $state, $stage));
         }
 
@@ -179 +191 @@
     }
 
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
 
 }
@@ -191 +207 @@
     my ($state) = @_;
 #print time, $/;
-    printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                                                                         %10s (any faults are shown in parentheses)                                                                 |\n", $state);
-    printf("+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+\n");
-    printf("| no  |              label               | distributing? |  publishing?  |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    dist    |   publish  |\n");
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    my $stage;
+
+    printf("|\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
+    printf("| no  |              label               | distributing? |  publishing?  |");
 
     my $stdsLabel;
@@ -202 +222 @@
     my $distributing;
     my $publishing;
-    my $stage;
     my $i=1;
+    foreach $stage (@stages) {
+
+        printf("%14s|", $stage)
+    }
+    printf("\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
+
     foreach $stdsLabel (@stdscienceLabels) {
 
@@ -225 +255 @@
         foreach $stage (@stages) {
 
-            printf("| %10s ", getStateAndFaultsString($stdsLabel, $state, $stage));
+            printf("|%14s", getStateAndFaultsString($stdsLabel, $state, $stage));
         }
 
@@ -232 +262 @@
     }
 
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
 
 }

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/CzarDb.pm

@@ -9 +9 @@
 
 my @stages = (
-        "burntool", 
         "chip", 
         "cam", 
@@ -16 +15 @@
         "stack", 
         "diff", 
-        "magic", 
-        "magicDS", 
         "dist", 
-        "pub"); # TODO put elsewhere
+        "pub",
+        "chipbackground"); # TODO put elsewhere
 
 my @ippToPspsStages = (

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/DayMetrics.pm

@@ -40 +40 @@
     $self->{begin} =  "$yesterday " . $self->{config}->getMetricsStartTime();
     $self->{end} = $self->{czarDb}->addInterval($self->{begin}, "1 DAY");
-    $self->{burntoolEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");
+    $self->{chipEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");
 
     # create path, dir and html file
@@ -67 +67 @@
     my $htmlFile = $self->{htmlFile};
 
-    # summit and burntool exposures
+    # summit and chip exposures
     my $summitExposures = $self->{gpc1Db}->countScienceExposuresFromLastNight($self->{day});
-    my $burntoolMetrics = new czartool::StageMetrics("burntool", "all_stdscience_labels", $self->{begin}, $self->{burntoolEnd});
-    $self->{czarDb}->runAnalysis($burntoolMetrics);
+    my $chipMetrics = new czartool::StageMetrics("chip", "all_stdscience_labels", $self->{begin}, $self->{chipEnd});
+    $self->{czarDb}->runAnalysis($chipMetrics);
 
     my $previousDay = $self->{czarDb}->subtractInterval($self->{day}, "1 DAY");
@@ -78 +78 @@
     print $htmlFile "<a href=\"../$previousDay/index.html\"> \< previous day</a> | <a href=\"../index.html\">all</a> | <a href=\"../$nextDay/index.html\">next day \></a><br>\n";
     print $htmlFile "Measured from $self->{begin} to $self->{end} HST<br>\n";
-    printf ( $htmlFile "%d exposures taken on summit last night, %d through burntool today</h5>\n", 
-            $summitExposures, $burntoolMetrics->getProcessed() ? $burntoolMetrics->getProcessed() : 0 );
+    printf ( $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n", 
+            $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 );
     print $htmlFile "</head>\n";
     print $htmlFile "<body>\n";
@@ -98 +98 @@
     my %labelTables;
 
-    my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
+    my @stages = (
+            "chip", 
+            "cam", 
+            "fake", 
+            "warp", 
+            "stack", 
+            "staticsky", 
+            "diff", 
+            "dist",
+            "chipbackground");
 
 
@@ -126 +135 @@
         foreach my $stage ( @stages ){
 
-            my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "burntool") ? $self->{burntoolEnd} : $self->{end});
+            my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "chip") ? $self->{chipEnd} : $self->{end});
             if (!$self->{czarDb}->runAnalysis($stageMetrics)) {next;}
 
@@ -253 +262 @@
     print $htmlFile "  <tr>\n";
     print $htmlFile "    <th>Survey</th>\n";
-    print $htmlFile "    <th>Started burntool</th>\n";
+    print $htmlFile "    <th>Started chip</th>\n";
     print $htmlFile "    <th>Finished distribution</th>\n";
     print $htmlFile "    <th>Time taken</th>\n";
@@ -260 +269 @@
     # OSS survey
     my ($started, $finished, $timeTaken) = undef;
-    $self->{czarDb}->getDayTimings("OSS.nightlyscience", "burntool", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);
+    $self->{czarDb}->getDayTimings("OSS.nightlyscience", "chip", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);
     $self->printSurveyDetails("OSS", $started, $finished, $timeTaken);
 
@@ -285 +294 @@
     foreach $mdf (@mdfs) {
 
-        if ($self->{czarDb}->getDayTimings($mdf, "burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {
+        if ($self->{czarDb}->getDayTimings($mdf, "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {
 
             if ($started && $self->{czarDb}->isBefore($started, $earliest)) {$earliest = $started; $haveStart = 1;}
@@ -299 +308 @@
     $self->printSurveyDetails("MDF", $earliest, $latest, $timeTaken);
 
-    $self->{czarDb}->getDayTimings("all_stdscience_labels", "burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);
+    $self->{czarDb}->getDayTimings("all_stdscience_labels", "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);
     $self->printSurveyDetails("All", $started, $finished, $timeTaken);
 

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Gpc1Db.pm

@@ -24 +24 @@
     elsif ($stage eq "warp") {${$joinTable}="warpSkyfile";}
     elsif ($stage eq "stack") {${$joinTable}="stackSumSkyfile";}
+    elsif ($stage eq "staticsky") {${$id} = "sky_id"; ${$joinTable}="staticskyResult";}
     elsif ($stage eq "diff") {${$joinTable}="diffSkyfile";}
     elsif ($stage eq "magic") {${$joinTable}="magicNodeResult";}
@@ -29 +30 @@
     elsif ($stage eq "dist") {${$joinTable}="distComponent";}
     elsif ($stage eq "pub") {${$joinTable}="publishDone";}
+    elsif ($stage eq "chipbackground") {${$id}="chip_bg_id"; ${$joinTable}="chipBackgroundImfile";}
     else {
 
@@ -51 +53 @@
     elsif ($stage eq "warp" ) {return "warpRun";}
     elsif ($stage eq "stack" ) {return "stackRun";}
+    elsif ($stage eq "staticsky" ) {return "staticskyRun";}
     elsif ($stage eq "diff" ) {return "diffRun";}
     elsif ($stage eq "magic" ) {return "magicRun";}
@@ -56 +59 @@
     elsif ($stage eq "dist" ) {return "distRun";}
     elsif ($stage eq "pub" ) {return "publishRun";}
+    elsif ($stage eq "chipbackground" ) {return "chipBackgroundRun";}
 
     return "ERROR";

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Plotter.pm

@@ -11 +11 @@
 
 my @allStages = (
-        "burntool", 
         "chip", 
         "cam", 
@@ -17 +16 @@
         "warp", 
         "stack", 
+        "staticsky", 
         "diff", 
-        "magic", 
-        "magicDS", 
         "dist", 
-        "pub");
+        "pub",
+        "chipbackground");
 
 my @allIppToPspsStages = (

branches/eam_branches/ipp-20120405/ippMonitor/czartool/roboczar.pl

@@ -21 +21 @@
 my $czarDb = $config->getCzarDbInstance();
 
-my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist"); # TODO get from Pantasks
+my @stages = (
+        "chip", 
+        "cam", 
+        "fake", 
+        "warp", 
+        "stack", 
+        "staticsky", 
+        "diff", 
+        "dist",
+        "chipbackground"); # TODO get from Pantasks
 
 my @interestedServers = $config->getRoboczarInterestedServers();

branches/eam_branches/ipp-20120405/ippMonitor/def/addRunRun.d

@@ -9 +9 @@
 
 #     field                   size  format  name         show    link to                  extras
-FIELD distinct(addRun.add_id),        5, %d,     add ID
+FIELD addRun.add_id,       5, %d,     addID
 FIELD addRun.stage,        5, %s,     stage
-FIELD addRun.stage_id,          5, %d,     stage ID
-FIELD addRun.add_id,        5, %d,     add ID
+FIELD addRun.stage_id,     5, %d,     stageID
+FIELD addRun.stage_extra1, 5, %d,     stageExtra1
+#FIELD addRun.add_id,       5, %d,     addID
 FIELD addRun.state,        5, %s,     state
-FIELD addRun.workdir,        5, %s,     workdir
-FIELD addRun.reduction,        5, %s,     reduction
+FIELD addRun.workdir,      5, %s,     workdir
+FIELD addRun.reduction,    5, %s,     reduction
 FIELD addRun.label,        5, %s,     label
-FIELD addRun.data_group,        5, %s,     data_group
+FIELD addRun.data_group,   5, %s,     data_group
 FIELD addRun.dvodb,        5, %s,     dvodb
-FIELD addRun.note,        5, %s,     note
-FIELD addRun.image_only,        5, %d,   image_only
-FIELD addRun.minidvodb,        5, %d,     minidvodb
-FIELD addRun.minidvodb_group,        5, %s,     minidvodb_group
-FIELD addRun.minidvodb_name,        5, %s,     minidvodb_name
-
-
+FIELD addRun.note,         5, %s,     note
+FIELD addRun.image_only,   5, %d,   image_only
+FIELD addRun.minidvodb,    5, %d,     minidvodb
+FIELD addRun.minidvodb_group, 5, %s,     minidvodb_group
+FIELD addRun.minidvodb_name,  5, %s,     minidvodb_name

branches/eam_branches/ipp-20120405/ippMonitor/def/exposureStatus.d

@@ -2 +2 @@
 TITLE Exposures Status
 FILE exposureStatus.php
-MENU ipp.imfiles.dat
+MENU ipp.czar.dat
 
 WHERE object != 'ENGINEERING'

branches/eam_branches/ipp-20120405/ippMonitor/def/gpc1MysqlProcessList.d

@@ -2 +2 @@
 TITLE GPC 1 MySql Process List
 FILE gpc1MysqlProcessList.php
-MENU ipp.imfiles.dat
+MENU ipp.czar.dat
 
 FIELD ID,   5,  %d, Process ID

branches/eam_branches/ipp-20120405/ippMonitor/def/maskStats.d

@@ -2 +2 @@
 TITLE Mask Stats
 FILE  maskStats.php
-MENU  ipp.imfiles.dat
+MENU  ipp.czar.dat
 
 WHERE rawExp.exp_id = chipRun.exp_id

branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbProcessed.d

@@ -9 +9 @@
 
 #     field                   size  format  name         show    link to                  extras
-FIELD distinct(minidvodbRun.minidvodb_id),        5, %d,     Minidvodb ID
-
+FIELD minidvodbRun.minidvodb_id,        5, %d,     Minidvodb ID
 FIELD minidvodbRun.minidvodb_name,          5, %s,     minidvodb_name
 FIELD minidvodbRun.minidvodb_group,       5, %s,     minidvodb_group
-FIELD minidvodbProcessed.merge_order,        5, %d,     Merge Order
 FIELD minidvodbProcessed.dtime_resort,        5, %d,     resort time
 FIELD minidvodbProcessed.dtime_relphot,        5, %d,     relphot time
-FIELD minidvodbProcessed.dtime_merge,        5, %d,     dvomerge time
-FIELD minidvodbProcessed.mergedvodb_path,          25, %s,     mergedvodb_path
+FIELD minidvodbProcessed.dtime_script,        5, %d,     script time
 FIELD state,          5, %s,    State
 FIELD minidvodbProcessed.fault,        5, %d,     Fault

branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbRun.d

@@ -9 +9 @@
 
 #     field                   size  format  name         show    link to                  extras
-FIELD distinct(minidvodbRun.minidvodb_id),        5, %d,     Minidvodb ID
+FIELD minidvodbRun.minidvodb_id,        5, %d,     Minidvodb ID
 FIELD minidvodbRun.minidvodb_name,          5, %s,     minidvodb_name
 FIELD minidvodbRun.minidvodb_group,       5, %s,     minidvodb_group
 FIELD minidvodbRun.minidvodb_path,    25, %s,     minidvodb_path
-FIELD minidvodbRun.mergedvodb_path,          25, %s,     mergedvodb_path
+#FIELD minidvodbRun.mergedvodb_path,          25, %s,     mergedvodb_path
 FIELD state,          5, %s,    State
 FIELD creation_date,        5, %T,     epoch

branches/eam_branches/ipp-20120405/ippMonitor/def/mopsStatus.d

@@ -2 +2 @@
 TITLE MOPS Status
 FILE mopsStatus.php
-MENU ipp.imfiles.dat
+MENU ipp.czar.dat
 #WHERE rawExp.obs_mode!='ENGINEERING'
 

branches/eam_branches/ipp-20120405/ippMonitor/def/warpProcessedSkyfiles_Images.d

@@ -1 +1 @@
 TABLE  rawExp JOIN chipRun USING(exp_id) JOIN camRun USING(chip_id) JOIN fakeRun USING(cam_id) JOIN warpRun USING(fake_id) JOIN warpSkyfile USING(warp_id)
 TITLE Warp Processed Skyfiles
-FILE  warpProcessedSkyfiles.php
+FILE  warpProcessedSkyfiles_Images.php
 MENU  ipp.science.dat
 

branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_ipptopsps.php

@@ -23 +23 @@
 
 if ($ID['menu']) {$myMenu = $ID['menu'];}
-else {$myMenu = "ipp.imfiles.dat";}
+else {$myMenu = "ipp.czar.dat";}
 
 menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']);
@@ -78 +78 @@
 
 $debug = 0;
-$table = "<table bgcolor=\"#FFFFFF\" width=\"700\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
+$table = "<table bgcolor=\"#FFFFFF\" width=\"900\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
 
 

branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_labels.php

@@ -23 +23 @@
 
 if ($ID['menu']) {$myMenu = $ID['menu'];}
-else {$myMenu = "ipp.imfiles.dat";}
+else {$myMenu = "ipp.czar.dat";}
 
 menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']);
 
 $stages=array(
-        "burntool", 
         "chip",
         "cam",
@@ -34 +33 @@
         "warp",
         "stack",
+        "staticsky",
         "diff",
-        "magic",
-        "magicDS",
         "dist", 
-        "pub");
+        "pub",
+        "chipbackground");
 
 $servers=array(
@@ -92 +91 @@
 
 $debug = 0;
-$table = "<table bgcolor=\"#FFFFFF\" width=\"700\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
+$table = "<table bgcolor=\"#FFFFFF\" width=\"900\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
 
 $labels = getLabels($czardb, $selectedMode);
@@ -441 +440 @@
         $anyFaults = false; 
 
-        $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
-
         $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState;
         getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults);
@@ -465 +460 @@
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
 
+        $link = $defaultlink;
+        getStateAndFaults($db, $thisLabel, $selectedState, "staticsky", $str, $anyFaults);
+        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
+
         $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState;
         getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults);
@@ -470 +469 @@
 
         $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
-
-        $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
-
-        $link = $defaultlink;
         getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults);
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
@@ -485 +476 @@
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$publishing) ? "gray" : null);
 
+        $link = $defaultlink;
+        getStateAndFaults($db, $thisLabel, $selectedState, "chipbackground", $str, $anyFaults);
+        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
+
         echo "</tr>\n";
     }
@@ -492 +487 @@
     createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null);
 
-    createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor");
-
     foreach ($stages as &$stage) {
 
-        if ($stage == "burntool") continue;
         $reverting = getRevertStatus($db, $stage);
-        #$link = 
-        #    "czartool_labels.php?pass=".$pass
-        #    ."&proj=".$proj
-        #    ."&mode=" .$selectedMode
-        #    ."&label=".$selectedLabel
-        #    ."&stage=".$selectedStage
-        #    ."&plottype=".$plotType
-        #    ."&revertstage=".$stage
-        #    ."&revertmode=";
-#
-        #if(!$reverting) {$label =  "Start";$link = $link . "on";}
-        #if($reverting) {$label = "Stop";$link = $link . "off";}
-        if(!$reverting) {$label =  "no";}
-        if($reverting) {$label = "yes";}
+        if(!$reverting) {$label =  "";}
+        if($reverting) {$label = "reverting";}
         unset($reverting);
-        #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
         createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor");
-        #echo "<td><a href=\"$link\"><font color=\"blue\">$label</font></td>";
-
     }
 

branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.dvodb.dat

@@ -9 +9 @@
              
 menulink  | menuselect   | link    | minidvodbRun              | minidvodbRun.php
-menulink  | menuselect   | link    | minidvodbProcessed         | minidvodbProcessed.php            
+menulink  | menuselect   | link    | minidvodbProcessed         | minidvodbProcessed.php    
 menulink  | menuselect   | link    | minidvodbCopy               | minidvodbCopy.php            
 
+menutop   | menutop      | plain   |     |
+
+menulink  | menuselect   | link    | mergedvodbRun              | mergedvodbRun.php
+menulink  | menuselect   | link    | mergedvodbProcessed         | mergedvodbProcessed.php    
+menulink  | menuselect   | link    | mergedvodbCopy               | mergedvodbCopy.php            
+
+menutop   | menutop      | plain   |     |
+
+menulink  | menuselect   | link    | dvodbStatus               | dvodbStatus.php
+menulink  | menuselect   | link    | dvodbFaulted               | dvodbFaulted.php            
+menulink  | menuselect   | link    | addRun Summary        | addRunSummary.php            

branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.menu.dat

@@ -27 +27 @@
 menutop   | menutop      | link    | Calibration                  | ipp.cal.php
 menutop   | menutop      | link    | Plots                        | ipp.plots.php
+menutop   | menutop      | link    | Czar                         | ipp.czar.php
 menutop   | menutop      | link    | Admin and Debug              | ipp.imfiles.php

branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.science.dat

@@ -38 +38 @@
 menulink  | menuselect   | link    | Warp Skyfile Inputs          | warpStageSkyfileInputs.php
 menulink  | menuselect   | link    | Warp Processed Skyfiles      | warpProcessedSkyfiles.php
+#menulink  | menuselect   | link    | Warp Processed Skyfiles w/ Images     | warpProcessedSkyfiles_images.php
 menulink  | menuselect   | link    | Warp Failed Skyfiles         | warpFailedSkyfiles.php
 

branches/eam_branches/ipp-20120405/ippMonitor/raw/nightSummary.php

@@ -52 +52 @@
   $myMenu = $ID['menu'];
 } else {
-  $myMenu = "ipp.imfiles.dat";
+  $myMenu = "ipp.czar.dat";
 }
 

branches/eam_branches/ipp-20120405/ippScripts/scripts/destreak_restore_camera.pl

@@ -422 +422 @@
                 # looks like a censored one
                 if (scalar @{$file{bad_instances}}) {
-                    my $bad = ${$file{bad_instances}}->[0];
+                    my $bad = ${$file{bad_instances}}[0];
                     $file{censored} = ($bad =~ /SR_/);
                     print "no good instances found setting censored based on $bad\n";

branches/eam_branches/ipp-20120405/ippScripts/scripts/nightly_science.pl

@@ -1539 +1539 @@
             $cmd .= " -simple  -set_label $label -exp_id $input_exp_id -template_exp_id $template_exp_id ";
 #               $cmd .= " -pretend ";
+            if (defined($reduction)) {
+                $cmd .= " -set_reduction $reduction ";
+            }
+
             if (defined($pretend)) {
                 $cmd .= ' -pretend ';
@@ -1670 +1674 @@
             $cmd .= "-set_workdir $workdir  -set_dist_group $dist_group  -set_data_group $new_data_group ";
             $cmd .= " -simple  -set_label $label -exp_id $input_exp_id -template_exp_id $template_exp_id ";
+            if (defined($reduction)) {
+                $cmd .= " -set_reduction $reduction ";
+            }
+
 #               $cmd .= " -pretend ";
             if (defined($pretend)) {
@@ -1724 +1732 @@
     $check_cmd .= " -pretend -simple  -rerun -set_label $label -filter $filter ";
     $check_cmd .= " -dateobs_begin ${lunation_start}T00:00:00 -dateobs_end ${lunation_end}T23:59:59 -distance 1.5 ";
+    if (defined($reduction)) {
+        $check_cmd .= " -set_reduction $reduction ";
+    }
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
@@ -1745 +1756 @@
             $cmd .= " -simple  -rerun -set_label $label -filter $filter ";
             $cmd .= " -dateobs_begin ${lunation_start}T00:00:00 -dateobs_end ${lunation_end}T23:59:59 -distance 1.5 ";
+            if (defined($reduction)) {
+                $cmd .= " -set_reduction $reduction ";
+            }
 
             if (defined($pretend)) {

branches/eam_branches/ipp-20120405/ippScripts/scripts/staticsky.pl

@@ -144 +144 @@
             my $path_base = $file->{path_base};
             print "input: $path_base\n";
+            my $stack_id = $file->{stack_id};
 
             my $imageCnv  = $ipprc->filename("PPSTACK.OUTPUT",          $path_base ); # Image name
@@ -172 +173 @@
             &my_die("Couldn't find input: $sources",   $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$sources");
 
+            print $listFile "  STACK_ID      S64  " . $stack_id  . "\n";
             print $listFile "  RAW:IMAGE     STR  " . $imageRaw  . "\n";
             print $listFile "  RAW:MASK      STR  " . $maskRaw   . "\n";

branches/eam_branches/ipp-20120405/ippTasks/pstamp.pro

@@ -13 +13 @@
 $pstampFin_DB = 0
 $pstampRev_DB = 0
+$pstampRevReq_DB = 0
 $pstampDep_DB = 0
 $pstampRevDep_DB = 0
@@ -117 +118 @@
 
 macro pstamp.revert.on
+    task pstamp.request.revert
+        active true
+    end
     task pstamp.job.revert
         active true
@@ -128 +132 @@
 end
 macro pstamp.revert.off
+    task pstamp.request.revert
+        active false
+    end
     task pstamp.job.revert
         active false
@@ -662 +669 @@
 end
 
+task pstamp.request.revert
+    host        local
+
+    periods     -poll $LOADPOLL
+    periods     -exec 1200
+    periods     -timeout 20
+    npending    1
+
+    task.exec
+        stdout NULL
+        stderr $LOGSUBDIR/pstamp.request.revert.log
+        $run = pstamptool -revertreq
+        if ($DB:n == 0)
+            option DEFAULT
+        else 
+            $run = $run $PS_DBSERVER -dbname $DB:$pstampRevReq_DB
+            $pstampRevReq_DB ++
+            if ($pstampRevReq_DB >= $DB:n) set pstampRevReq_DB = 0
+        end
+        add_poll_args run
+        add_poll_labels run
+        command $run
+    end
+
+    task.exit $EXIT_SUCCESS
+        # nothing to do
+    end
+
+    task.exit   default
+        showcommand failure
+    end
+
+    task.exit   crash
+        showcommand crash
+    end
+
+    task.exit   timeout
+        showcommand timeout
+    end
+end
 task pstamp.job.revert
     host        local

branches/eam_branches/ipp-20120405/ippTools/share/Makefile.am

@@ -450 +450 @@
         vptool_pendingrun.sql \
         vptool_processedcell.sql \
-        vptool_revertrun.sql
+        vptool_revertrun.sql \
+        sctool_list.sql
 

branches/eam_branches/ipp-20120405/ippTools/share/chiptool_pendingimfile.sql

@@ -6 +6 @@
     rawImfile.magicked as raw_magicked,
     (rawImfile.user_1 is not NULL and rawImfile.user_1 > 0.5) as deburned,
+    rawImfile.burntool_state as burntool_state,
+    rawImfile.video_cells as video_cells,
     rawExp.exp_tag,
     rawExp.exp_name,

branches/eam_branches/ipp-20120405/ippTools/share/pstamptool_revertreq_deletejobs.sql

@@ -3 +3 @@
 FROM pstampJob
     JOIN pstampRequest USING(req_id)
-WHERE pstampRequest.state = 'new'
+WHERE pstampRequest.state = 'new' 
+    AND pstampRequest.fault > 0

branches/eam_branches/ipp-20120405/ippTools/share/staticskytool_definebyquery_inputs.sql

@@ -6 +6 @@
   FROM stackRun
   JOIN stackSumSkyfile USING(stack_id)
+  JOIN skycell USING(tess_id, skycell_id)
   WHERE stackRun.state = 'full'
       AND stackSumSkyfile.fault = 0

branches/eam_branches/ipp-20120405/ippTools/share/staticskytool_definebyquery_select.sql

@@ -10 +10 @@
   FROM stackRun
   JOIN stackSumSkyfile USING(stack_id)
+  JOIN skycell using(tess_id, skycell_id)
   WHERE stackRun.state = 'full'
       AND stackSumSkyfile.fault = 0
@@ -29 +30 @@
     JOIN stackRun USING(stack_id)
     JOIN stackSumSkyfile USING(stack_id)
+    JOIN skycell USING(tess_id, skycell_id)
     WHERE 1
     -- restrict by selected filters, stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label

branches/eam_branches/ipp-20120405/ippTools/share/staticskytool_result.sql

@@ -6 +6 @@
     stackRun.tess_id,
     stackRun.skycell_id,
-    count(stackRun.filter) AS num_filters
+    count(stackRun.filter) AS num_filters,
+    skycell.glong,
+    skycell.glat
 FROM staticskyRun
 JOIN staticskyResult USING(sky_id)
 JOIN staticskyInput USING(sky_id)
-JOIN stackRun using(stack_id)
+JOIN stackRun USING(stack_id)
+LEFT JOIN skycell USING(tess_id, skycell_id)

branches/eam_branches/ipp-20120405/ippTools/src/addtool.c

@@ -1417 +1417 @@
   psString query = NULL;
   psStringAppend(&query, bare_query, minidvodb_group);
-  psStringAppend(&query, where_string);
+  psStringAppend(&query," %s ", where_string);
 
 

branches/eam_branches/ipp-20120405/ippTools/src/pstamptoolConfig.c

@@ -125 +125 @@
     psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-state", 0,      "state to revert", NULL);
     psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampRequest label (LIKE comparision)", NULL);
+    // this argument is supplied by pantasks so we accept it but don't use it
+    psMetadataAddU64(revertreqArgs, PS_LIST_TAIL, "-limit", 0,      "not used", 0);
 
     // -pendingcleanup

branches/eam_branches/ipp-20120405/ippTools/src/pxspace.c

@@ -56 +56 @@
     psMetadataAddF64(md, PS_LIST_TAIL, "-decl", 0,             "DEC value for radius search (degrees)", false);
 }
+
+void pxskycellAddArguments(psMetadata *md)
+{
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-ra_min",            0, "search by right ascension (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-dec_min",           0, "search by declination (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-ra_max",            0, "search by right ascension (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-dec_max",           0, "search by declination (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-glong_min",         0, "search by galactic longitude (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-glat_min",          0, "search by galactic latitude (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-glong_max",         0, "search by galactic longitude (degrees)", NAN);
+    psMetadataAddF32(md,  PS_LIST_TAIL, "-glat_max",          0, "search by galactic latitude (degrees)", NAN);
+}
+
+bool pxskycellAddWhere(pxConfig *config, psMetadata *where)
+{
+    PXOPT_COPY_F32(config->args, where, "-ra_min", "skycell.radeg", ">=");
+    PXOPT_COPY_F32(config->args, where, "-dec_min", "skycell.decdeg", ">=");
+    PXOPT_COPY_F32(config->args, where, "-ra_max", "skycell.radeg", "<");
+    PXOPT_COPY_F32(config->args, where, "-dec_max", "skycell.decdeg", "<");
+    PXOPT_COPY_F32(config->args, where, "-glong_min", "skycell.glong", ">=");
+    PXOPT_COPY_F32(config->args, where, "-glat_min", "skycell.glat", ">=");
+    PXOPT_COPY_F32(config->args, where, "-glong_max", "skycell.glong", "<");
+    PXOPT_COPY_F32(config->args, where, "-glat_max", "skycell.glat", "<");
+    return true;
+}

branches/eam_branches/ipp-20120405/ippTools/src/pxspace.h

@@ -1 +1 @@
 /*
- * pxmagic.h
+ * pxspace.h
  *
  * Copyright (C) 2009  IfA
@@ -24 +24 @@
 extern void pxspaceAddArguments(psMetadata *md);
 
+extern bool pxskycellAddWhere(pxConfig *config, psMetadata *where);
+extern void pxskycellAddArguments(psMetadata *md);
+
 #endif // PXSPACE_H

branches/eam_branches/ipp-20120405/ippTools/src/sctool.c

@@ -31 +31 @@
 #include "pxdata.h"
 #include "pxchip.h"
+#include "pxspace.h"
 
 #include "sctool.h"
 
 static bool defineskycellsMode(pxConfig *config);
+static bool listMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -53 +55 @@
 
     switch (config->mode) {
-        MODECASE(SCTOOL_MODE_DEFINESKYCELLS,         defineskycellsMode);
+        MODECASE(SCTOOL_MODE_DEFINESKYCELLS,    defineskycellsMode);
+        MODECASE(SCTOOL_MODE_LIST,              listMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -131 +134 @@
     return true;
 }
+static bool listMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    psMetadata *where = psMetadataAlloc();
+
+    PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell.skycell_id", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-tess_id", "skycell.tess_id", "LIKE");
+    pxskycellAddWhere(config, where);
+
+    psString query = pxDataGet("sctool_list.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!psListLength(where->list)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "search paramters are required\n");
+        psFree(where);
+        return false;
+    }
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringAppend(&query, " WHERE %s", whereClause);
+    psFree(whereClause);
+
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    if (!psArrayLength(output)) {
+        psTrace("sctool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    if (!ippdbPrintMetadatas(stdout, output, "skycell", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
+
+
+    return true;
+}

branches/eam_branches/ipp-20120405/ippTools/src/sctool.h

@@ -26 +26 @@
     SCTOOL_MODE_NONE      = 0x0,
     SCTOOL_MODE_DEFINESKYCELLS,
+    SCTOOL_MODE_LIST,
 } sctoolMode;
 

branches/eam_branches/ipp-20120405/ippTools/src/stacktool.c

@@ -232 +232 @@
     PXOPT_COPY_F32(config->args,  where, "-select_fwhm_minor_min",     "camProcessedExp.fwhm_minor", ">=");
     PXOPT_COPY_F32(config->args,  where, "-select_fwhm_minor_max",     "camProcessedExp.fwhm_minor", "<=");
+    PXOPT_COPY_F32(config->args,  where, "-select_elong_max",          "(camProcessedExp.fwhm_major / camProcessedExp.fwhm_minor)", "<=");
+    PXOPT_COPY_F32(config->args,  where, "-select_iq_elong_max",       "(camProcessedExp.iq_fwhm_major / camProcessedExp.iq_fwhm_minor)", "<=");
     PXOPT_COPY_F32(config->args,  where, "-select_iq_m2_max",          "camProcessedExp.iq_m2", "<=");
     PXOPT_COPY_F32(config->args,  where, "-select_iq_m2_min",          "camProcessedExp.iq_m2", ">=");
@@ -239 +241 @@
     PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_min",        "camProcessedExp.zpt_obs", ">=");
     PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_max",        "camProcessedExp.zpt_obs", "<=");
+    PXOPT_COPY_F32(config->args,  where, "-select_bg_max",             "camProcessedExp.bg", "<=");
+    PXOPT_COPY_F32(config->args,  where, "-select_bg_stdev_max",       "camProcessedExp.bg_stdev", "<=");
     PXOPT_COPY_F32(config->args,  where, "-select_astrom",             "sqrt(POWER(camProcessedExp.sigma_ra, 2) + POWER(camProcessedExp.sigma_dec, 2))", "<=");
 

branches/eam_branches/ipp-20120405/ippTools/src/stacktoolConfig.c

@@ -82 +82 @@
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_minor_min", 0, "define min fwhm (minor axis)", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_minor_max", 0, "define max fwhm (minor axis)", NAN);
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_elong_max", 0, "define max elongation from fwhm ", NAN);
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_elong_max", 0, "define max elongation from iq_fwhm ", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_m2_min", 0, "define min iq_m2", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_m2_max", 0, "define max iq_m2", NAN);
@@ -90 +92 @@
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_min", 0, "define min zero point", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_max", 0, "define max zero point", NAN);
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_bg_max", 0, "define max background", NAN);
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_bg_stdev_max", 0, "define max background stdev", NAN);    
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_astrom", 0, "define max astrometry rms", NAN);
     psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", PS_META_DUPLICATE_OK, "include this warp ID (multiple OK)", 0);

branches/eam_branches/ipp-20120405/ippTools/src/staticskytool.c

@@ -29 +29 @@
 
 #include "pxtools.h"
+#include "pxspace.h"
 #include "staticskytool.h"
 
@@ -131 +132 @@
     pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_min",      "skycell.glat",              ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_max",      "skycell.glat",              "<=");
 
     // find the number of requested filters:
@@ -390 +393 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-sky_id",  "sky_id",   "==");
-    PXOPT_COPY_STR(config->args, where, "-label",   "label",    "==");
-    PXOPT_COPY_STR(config->args, where, "-state",   "state",    "==");
+    PXOPT_COPY_S64(config->args, where, "-sky_id",      "sky_id",   "==");
+    PXOPT_COPY_STR(config->args, where, "-label",       "staticskyRun.label",    "==");
+    PXOPT_COPY_STR(config->args, where, "-state",       "staticskyRun.state",    "==");
+    PXOPT_COPY_STR(config->args, where, "-tess_id",     "stackRun.tess_id",    "==");
+    PXOPT_COPY_STR(config->args, where, "-skycell_id",  "stackRun.skycell_id",    "==");
+    if (!pxskycellAddWhere(config, where)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
     if (!psListLength(where->list)) {
         psFree(where);
@@ -399 +408 @@
     }
 
-    psString query = psStringCopy("UPDATE staticskyRun");
+    psString query = psStringCopy("UPDATE staticskyRun JOIN staticskyInput USING(sky_id) JOIN stackRun using(stack_id) JOIN skycell USING(tess_id, skycell_id)");
 
     // pxUpdateRun gets parameters from config->args and updates
@@ -638 +647 @@
     PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
     PXOPT_COPY_S16(config->args, where, "-fault",      "staticskyResult.fault", "==");
+    pxskycellAddWhere(config, where);
     PXOPT_LOOKUP_S32(num_filters, config->args, "-num_filters", false, false);
 

branches/eam_branches/ipp-20120405/ippTools/src/staticskytoolConfig.c

@@ -55 +55 @@
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_min", 0, "define min galactic latitude", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_max", 0, "define max galactic latitude", NAN);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label (required)", NULL);
@@ -73 +75 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess_id", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell_id", NULL);
+    pxskycellAddArguments(updaterunArgs);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "define new value for label", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "define new state", NULL);
@@ -113 +118 @@
     psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);
     psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-num_filters", 0, "search by number of filters in the inputs (>=)", 0);
+    pxskycellAddArguments(resultArgs);
     psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
     psMetadataAddU64(resultArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);

branches/eam_branches/ipp-20120405/ppImage/src/ppImage.h

@@ -57 +57 @@
     bool addNoise;                      // Add noise to degrade MD image to 3pi
 
+  bool hasVideo;                      // Determine if this OTA has a video cell
+  bool useVideoDark;                  // Should we use a video dark if we can?
+  bool useVideoMask;                  // Should we use a video mask if we can?
+  
     // output files requested
     bool BaseFITS;

branches/eam_branches/ipp-20120405/ppImage/src/ppImageDetrendReadout.c

@@ -35 +35 @@
       }
     }
-
+    // Check to see if we're in a chip that contains video
+    bool hasVideo = false;
+    {
+      if (psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE")) {
+        psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
+        char *Vptr = strchr(psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE"),'V');
+        if (Vptr) {
+          hasVideo = true;
+          psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
+        }
+      }
+    }
+
+    
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
     if (options->doMaskBuild) {
@@ -44 +57 @@
     // apply the externally supplied mask to the input->mask pixels
     if (options->doMask) {
-        pmReadout *mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
-        pmMaskBadPixels(input, mask, options->maskValue);
+      pmReadout *mask;
+      if ((options->useVideoMask)&&(hasVideo)) {
+        mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.VIDEOMASK");
+      }
+      else {
+        mask = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.MASK");
+      }
+      pmMaskBadPixels(input, mask, options->maskValue);
     }
     if (options->doMaskBurntool) {
@@ -80 +99 @@
         psMetadata *recipe = psMetadataLookupPtr (&mdok, config->recipes, RECIPE_NAME);
         assert(mdok && recipe);
-        if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
+
+        if ((options->useVideoDark)&&(hasVideo)) {
+          if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
+            oldDark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.VIDEODARK");
+          } else {
+            dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.VIDEODARK");
+          }
+        }
+        else {
+          if (psMetadataLookupBool(&mdok, recipe, "OLDDARK")) {
             oldDark = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.DARK");
-        } else {
+          } else {
             dark = pmFPAfileThisCell(config->files, detview, "PPIMAGE.DARK");
-        }
+          }
+        }
     }
 

branches/eam_branches/ipp-20120405/ppImage/src/ppImageOptions.c

@@ -45 +45 @@
     options->doMaskStats     = false;   // Calculate mask fractions
     options->addNoise        = false;  //Degrade an MD image to a 3pi image
-
+    options->hasVideo        = false;   // Determine if this OTA has a video cell
+    options->useVideoDark    = false;   // Use video dark if we can?
+    options->useVideoMask    = false;   // Use video mask if we can?
     // output files requested
     options->BaseFITS        = false;   // create output image
@@ -362 +364 @@
     options->fringeKeep = psMetadataLookupF32(NULL, recipe, "FRINGE.KEEP");
 
+    // Video cell options
+    if (psMetadataLookup(recipe, "USE.VIDEO.DARK")) {
+      options->useVideoDark = psMetadataLookupBool(NULL,recipe,"USE.VIDEO.DARK");
+    }
+    if (psMetadataLookup(recipe, "USE.VIDEO.MASK")) {
+      options->useVideoMask = psMetadataLookupBool(NULL,recipe,"USE.VIDEO.MASK");
+    }
+
     // Pattern correction
     if (psMetadataLookup(format, "PATTERN.ROW.ORDER")) {
@@ -418 +428 @@
       options->patternContinuityEdgeWidth = psMetadataLookupS32(NULL, recipe, "PATTERN.CONTINUITY.WIDTH");
     }
-    
+
 
     // Remnance options

branches/eam_branches/ipp-20120405/ppImage/src/ppImageParseCamera.c

@@ -22 +22 @@
     ppImageOptions *options = ppImageOptionsParse(config);
 
+    // parse the header to extract out whether this OTA has video cells.
+    // CZW: 2012-05-01 I'm somewhat ashamed of what needs to be done to get to the header. There has to be a simpler way, right?
+/*     pmFPAview *view = pmFPAviewAlloc(0);// View for level of interest */
+/*     pmChip *chip;                       // Chip from FPA */
+/*     while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) { */
+/*       if (!chip->process || !chip->file_exists) { */
+/*      continue; */
+/*       } */
+/* /\*       if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) { *\/ */
+/* /\*  continue; *\/ */
+/* /\*       } *\/ */
+/*       psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask); */
+/*       if (psMetadataLookupStr(NULL,chip->hdu->header,"CELLMODE")) { */
+/*      psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask); */
+/*      char *Vptr = strchr(psMetadataLookupStr(NULL,chip->hdu->header,"CELLMODE"),'V'); */
+/*      if (Vptr) { */
+/*        options->hasVideo = true; */
+/*        psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask); */
+/*      } */
+/*       } */
+/*     } */
+/*     pmFPAviewReset(view); */
+/*     psFree(view); */
+    
     // the following are defined from the argument list, if given,
     // otherwise they revert to the config information
@@ -42 +66 @@
     }
     if (options->doDark) {
-        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.DARK", "DARK",
-                               PM_FPA_FILE_DARK, PM_DETREND_TYPE_DARK)) {
+      // Always load the regular Dark
+      if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.DARK", "DARK",
+                             PM_FPA_FILE_DARK, PM_DETREND_TYPE_DARK)) {
+        psError(PS_ERR_IO, false, "Can't find a dark image source");
+        psFree(options);
+        return NULL;
+      }
+      // Sometimes load the video dark if we need it.
+      if (options->useVideoDark) {
+        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.VIDEODARK", "DARK",
+                               PM_FPA_FILE_DARK, PM_DETREND_TYPE_VIDEODARK)) {
             psError(PS_ERR_IO, false, "Can't find a dark image source");
             psFree(options);
             return NULL;
         }
+      }
     }
     if (options->doMask) {
-        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.MASK", "MASK",
-                               PM_FPA_FILE_MASK, PM_DETREND_TYPE_MASK)) {
+      // Always load the regular mask
+      if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.MASK", "MASK",
+                             PM_FPA_FILE_MASK, PM_DETREND_TYPE_MASK)) {
+        psError(PS_ERR_IO, false, "Can't find a mask image source");
+        psFree(options);
+        return NULL;
+      }
+
+      if (options->useVideoMask) {
+        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.VIDEOMASK", "MASK",
+                               PM_FPA_FILE_MASK, PM_DETREND_TYPE_VIDEOMASK)) {
             psError(PS_ERR_IO, false, "Can't find a mask image source");
             psFree(options);
             return NULL;
         }
+      }
     }
     if (options->doShutter) {

branches/eam_branches/ipp-20120405/ppMerge/src/ppMergeCamera.c

@@ -224 +224 @@
             format = (HDU)->format; \
         } else if (format != (HDU)->format) { \
-            psError(PS_ERR_UNKNOWN, true, "Camera format %d doesn't match: %p vs %p", \
-                    i, format, (HDU)->format); \
+          psError(PS_ERR_UNKNOWN, true, "Camera format %d doesn't match: %p vs %p on %s %s", \
+                  i, format, (HDU)->format, (HDU)->extname, psMetadataLookupStr(NULL,(HDU)->header,"FILENAME")); \
             psFree(phuView); \
             return false; \
@@ -232 +232 @@
     } \
 }
+    // CZW: 2012-04-10 Version of above to allow different camera formats to be processed together.
+/* #define CHECK_LEVEL(HDU, CHIP, CELL) { \ */
+/*     if (HDU) { \ */
+/*         if (!phuView) { \ */
+/*             phuView = pmFPAviewAlloc(0); \ */
+/*             phuView->chip = CHIP; \ */
+/*             phuView->cell = CELL; \ */
+/*         } else if ((phuView->chip != (CHIP)) && (phuView->cell != (CELL))) { \ */
+/*             psError(PS_ERR_UNKNOWN, true, "Differing PHU for input %d", i); \ */
+/*             psFree(phuView); \ */
+/*             return false; \ */
+/*         } \ */
+/*         if (!format) { \ */
+/*             format = (HDU)->format; \ */
+/*         } else if (format != (HDU)->format) { \ */
+/*         } \ */
+/*         continue; \ */
+/*     } \ */
+/* } */
 
     psMetadata *format = NULL;          ///< Camera format

branches/eam_branches/ipp-20120405/psastro/src/psastroLoadCrosstalk.c

@@ -53 +53 @@
   pmFPAview *viewMask = pmFPAviewAlloc (0);
 
-  float zeropt, exptime, MAX_MAG;
+  float zeropt, exptime, MAX_MAG, SPIKE_MAX_MAG;
 
   psLogMsg ("psastro", PS_LOG_INFO, "determine crosstalk positions");
@@ -105 +105 @@
   MAX_MAG += MagOffset;
 
+  // Get the spike maximum, as well
+  SPIKE_MAX_MAG = psMetadataLookupF32(&status, recipe, "REFSTAR_MASK_BLEED_MAG_MAX");
+  SPIKE_MAX_MAG += MagOffset;
+  
   psTrace("psastro.crosstalk",2,"%f %f %f %f\n",zeropt,exptime,MAX_MAG,MagOffset);
 
@@ -259 +263 @@
 
             pmAstromObj *crosstalk = pmAstromObjAlloc();
-
+            
             crosstalk->Mag = ref->Mag - MagOffset;
             crosstalk->chip->x = x_t_chip;
@@ -274 +278 @@
             }
             psArrayAdd(crosstalks,100,crosstalk);
-
+            
             psFree(targetChipName);
             psFree(targetCellName);
             psFree(crosstalk);
+
+            // Determine if we need to add a spike mask.
+/*          psWarning("BLAH: %g %g %g\n",ref->Mag,MagOffset,SPIKE_MAX_MAG); */
+            if (ref->Mag < SPIKE_MAX_MAG) {
+              if ((X == 2)&&(! ((U == 3)||(U == 5)||(U == 6)))) {
+                psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
+                continue;
+              }
+              if ((X == 3)&&(! ((U == 3)))) {
+                psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
+                continue;
+              }
+              if ((X == 4)&&(! ((U == 3)))) {
+                psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
+                continue;
+              }
+              if ((X == 5)&&(! ((U == 3)||(U == 5)||(U == 6)))) {
+                psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
+                continue;
+              }
+              
+              Xt = X;
+              Yt = Y;
+              Vt = V;
+              
+              for (Ut = 0; Ut < 8; Ut++) {
+
+                psString targetChipName = NULL;
+                psStringAppend(&targetChipName,"XY%d%d",Xt,Yt);
+                psString targetCellName = NULL;
+                psStringAppend(&targetCellName,"xy%d%d",Ut,Vt);
+                
+                psTrace ("psastro.crosstalk",2,"CTsource @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f [%s %s]",
+                         X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell,
+                         targetChipName,targetCellName);
+/*              psWarning ("CT bleed ct @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f [%s %s]", */
+/*                       X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell, */
+/*                       targetChipName,targetCellName); */
+                
+                pmCell *CTtargetCell = getCellByName (CTsourceChip,targetCellName);
+                if (!CTtargetCell) continue;
+                
+                pmChipCoordsForCell(&x_t_chip,&y_t_chip,CTtargetCell,x_t_cell,y_t_cell);
+
+                psTrace ("psastro.crosstalk",2,"CTsource @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f ChipLoc: (%f,%f)",
+                         X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell,x_t_chip,y_t_chip);
+                
+                // Hunt down the readout for the target, and save the chip position and magnitude of source star.
+                pmChip *targetChip = getChipByName(fpa,targetChipName);
+                if (!targetChip) continue;
+                if (!targetChip->cells) continue;
+                if (!targetChip->cells->n) continue;
+                
+                pmCell *targetCell = targetChip->cells->data[0];
+                if (!targetCell) continue;
+                if (!targetCell->readouts) continue;
+                if (!targetCell->readouts->n) continue;
+                pmReadout *targetReadout = targetCell->readouts->data[0];
+                if (!targetReadout) continue;
+                
+                pmAstromObj *crosstalk = pmAstromObjAlloc();
+                
+                crosstalk->Mag = ref->Mag;
+                crosstalk->chip->x = x_t_chip;
+                crosstalk->chip->y = y_t_chip;
+                
+                psArray *crosstalks = psMetadataLookupPtr (&status, targetReadout->analysis, "PSASTRO.CROSSTALKS.SPIKES");
+                if (crosstalks == NULL) {
+                  crosstalks = psArrayAllocEmpty(100);
+                  if (!psMetadataAdd(targetReadout->analysis,PS_LIST_TAIL,"PSASTRO.CROSSTALKS.SPIKES", PS_DATA_ARRAY, "crosstalk locations", crosstalks)) {
+                    psError(PSASTRO_ERR_CONFIG, false, "failure to add crosstalks to readout");
+                    goto escape;
+                  }
+                  psFree(crosstalks);
+                }
+                psArrayAdd(crosstalks,100,crosstalk);
+                
+                psFree(targetChipName);
+                psFree(targetCellName);
+                psFree(crosstalk);
+              }
+            } // End satspike crosstalks
+
+            
           } // refstars
         } // readout

branches/eam_branches/ipp-20120405/psastro/src/psastroLoadGhosts.c

@@ -128 +128 @@
                 for (int i = 0; i < refstars->n; i++) {
                     pmAstromObj *ref = refstars->data[i];
+                    psTrace("psastro.ghost",5,"Begin ghost %d/%ld: MAX_MAG: %g; ref_mag: %g @ (%.10g,%.10g)",i,refstars->n,MAX_MAG,ref->Mag,ref->sky->r * 180 / M_PI,ref->sky->d * 180.0 / M_PI);
                     if (ref->Mag > MAX_MAG) continue;
 
@@ -163 +164 @@
                     pmChip *ghostChip = psastroFindChip (&ghost->chip->x, &ghost->chip->y, fpa, -ghost->srcFP->x, -ghost->srcFP->y);
                     // fprintf (stderr, "raw chip position: %f, %f ", ghost->chip->x, ghost->chip->y);
-
+/*                  float ref_chip_x = ghost->chip->x; */
+/*                  float ref_chip_y = ghost->chip->y; */
                     ghostChip = psastroFindChip (&ghost->chip->x, &ghost->chip->y, fpa, ghost->FP->x, ghost->FP->y);
                     // fprintf (stderr, "-> model chip position: %f, %f\n", ghost->chip->x, ghost->chip->y);
 
+                    if (ghostChip) {
+                      psTrace("psastro.ghost",5,"   in ghost: %d/%ld: ref: (%f,%f) or (%s) ghost: (%f,%f) or (%f,%f,%s) %f inner: (%f,%f,%f) outer: (%f,%f,%f)",
+                              i,refstars->n,
+                              ref->FP->x,ref->FP->y,
+                              psMetadataLookupStr(NULL,chip->concepts,"CHIP.NAME"),
+                              ghost->FP->x,ghost->FP->y,
+                              ghost->chip->x,ghost->chip->y,psMetadataLookupStr(NULL,ghostChip->concepts,"CHIP.NAME"),
+                              rSrc,
+                              ghost->inner.major,ghost->inner.minor,ghost->inner.theta,
+                              ghost->outer.major,ghost->outer.minor,ghost->outer.theta);
+/*                    psWarning("   GHOST_DATA: %d/%ld: ref: (%f,%f) or (%f,%f,%s) ghost: (%f,%f) or (%f,%f,%s) %f inner: (%f,%f,%f) outer: (%f,%f,%f)", */
+/*                            i,refstars->n, */
+/*                            ref->FP->x,ref->FP->y, */
+/*                            ref_chip_x,ref_chip_y,psMetadataLookupStr(NULL,chip->concepts,"CHIP.NAME"), */
+/*                            ghost->FP->x,ghost->FP->y, */
+/*                            ghost->chip->x,ghost->chip->y,psMetadataLookupStr(NULL,ghostChip->concepts,"CHIP.NAME"), */
+/*                            rSrc, */
+/*                            ghost->inner.major,ghost->inner.minor,ghost->inner.theta, */
+/*                            ghost->outer.major,ghost->outer.minor,ghost->outer.theta); */
+                    }
+                    else {
+                      psTrace("psastro.ghost",5,"   in ghost: %d/%ld: ref: (%f,%f) ghost: (%f,%f) or (%f,%f,%s) inner: (%f,%f,%f) outer: (%f,%f,%f)",
+                              i,refstars->n,
+                              ref->FP->x,ref->FP->y,
+                              ghost->FP->x,ghost->FP->y,
+                              ghost->chip->x,ghost->chip->y,"NONE",
+                              ghost->inner.major,ghost->inner.minor,ghost->inner.theta,
+                              ghost->outer.major,ghost->outer.minor,ghost->outer.theta);
+                    }                 
+                      
+
+                            
                     if (!ghostChip) goto skip;
                     if (!ghostChip->cells) goto skip;
                     if (!ghostChip->cells->n) goto skip;
+
+                    
                     pmCell *ghostCell = ghostChip->cells->data[0];
                     if (!ghostCell) goto skip;
@@ -190 +226 @@
 
                 skip:
+                    
                     psFree (ghost);
                 }

branches/eam_branches/ipp-20120405/psastro/src/psastroMaskUpdates.c

@@ -406 +406 @@
                     // XXX for now, assume cell binning is 1x1 relative to chip
                     psastroMaskCircle (readoutMask->mask, crosstalkMaskValue, ref->chip->x, ref->chip->y, radius, radius);
+                  }
+                }
+                // Crosstalk Bleeds
+                psArray *bleedcrosstalks = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.CROSSTALKS.SPIKES");
+                if (bleedcrosstalks) {
+                  for (int i = 0; i < bleedcrosstalks->n; i++) {
+                    pmAstromObj *ref = bleedcrosstalks->data[i];
+                    float width = REFSTAR_MASK_BLEED_MAG_SLOPE * (REFSTAR_MASK_BLEED_MAG_MAX - ref->Mag);
+                    psTrace("psastro.crosstalk",2,"Masking spike on Chip %s @ (%f,%f) Magnitude: %f Radius %f\n",
+                            psMetadataLookupStr(&status,readout->parent->parent->concepts,"CHIP.NAME"),
+                            ref->chip->x,ref->chip->y,ref->Mag,width);
+                    // XXX for now, assume cell binning is 1x1 relative to chip
+                    pmCell *refCell = pmCellInChip(refChip,ref->chip->x,ref->chip->y);
+                    if (refCell) {
+                      float xCell = 0.0;
+                      float yCell = 0.0;
+                      pmCellCoordsForChip (&xCell, &yCell, refCell, ref->chip->x, ref->chip->y);
+                      int ySize = psMetadataLookupS32(NULL,refCell->concepts,"CELL.YSIZE");
+/*                    psWarning("Masking CTspike on Chip %s @ (%f,%f) Magnitude: %f (%f %f) Radius %f Z: %d %d %d %d\n", */
+/*                              psMetadataLookupStr(&status,readout->parent->parent->concepts,"CHIP.NAME"), */
+/*                              ref->chip->x,ref->chip->y,ref->Mag,REFSTAR_MASK_BLEED_MAG_SLOPE,REFSTAR_MASK_BLEED_MAG_MAX,width, */
+/*                              (int) (ref->chip->x - 0.5 * width),   (int) (ref->chip->y - yCell), */
+/*                              (int) (ref->chip->x+0.5 * width + 1), (int) (ref->chip->y + (ySize - yCell))); */
+                      psastroMaskRectangle (readoutMask->mask, crosstalkMaskValue,
+                                            (int) (ref->chip->x - 0.5 * width),   (int) (ref->chip->y - yCell),
+                                            (int) (ref->chip->x+0.5 * width + 1), (int) (ref->chip->y + (ySize - yCell)));
+                    }
                   }
                 }

branches/eam_branches/ipp-20120405/psastro/src/psastroMaskUtils.c

@@ -135 +135 @@
         // XXX optimize this
         float A = 1.0;
-        float B = shape.sxy*y*PS_SQR(shape.sx);
+        float B = 2.0 * shape.sxy*y*PS_SQR(shape.sx);
         float C = PS_SQR(y*shape.sx/shape.sy) - PS_SQR(shape.sx);
 

branches/eam_branches/ipp-20120405/tools/czarcal

@@ -24 +24 @@
 mark
 serge
-roy
 chris
 gene

branches/eam_branches/ipp-20120405/tools/dlapstacks

@@ -215 +215 @@
         } else {
             # otherwise use a temporary directory
+            $outdir = $tempdir;
             print "deasined files will be saved to $outdir\n" if $save_temps;
-            $outdir = $tempdir;
         }
     }

branches/eam_branches/ipp-20120405/tools/repair_bad_instance

@@ -123 +123 @@
         return 0;
     }
+    if (! ($nextend =~ /\d+/)) {
+        print "failed to find NEXTEND for $file. command returned $nextend\n";
+        return 0;
+    }
     print "\t$file: $nextend extensions\n";
+
 
     $command = 'fhead -x ' . ($nextend - 1) . " $file | grep EXTNAME | awk '{print \$3}'";

branches/eam_branches/ipp-20120405/tools/runbgchip.pl

@@ -97 +97 @@
 exit 0 if $pretend;
 
-exit system $command;
+my $rc = system $command;
+my $status = $rc >> 8;
+if ($rc) {
+    print "command returned $rc $status\n";
+}
+exit $status;
 
 

branches/eam_branches/ipp-20120405/tools/runchipimfile.pl

@@ -110 +110 @@
 exit 0 if $pretend;
 
-exit system $command;
+my $rc = system $command;
+my $status = $rc >> 8;
+if ($rc) {
+    print STDERR "command failed with $rc $status\n";
+    $status = 1 unless $status;
+} else {
+    print "Successfully rebuilt chip $chip_id $class_id\n";
+}
+exit $status;
 
 

branches/eam_branches/ipp-20120405/tools/runwarpskycell.pl

@@ -105 +105 @@
 exit 0 if $pretend;
 
-exit system $command;
+my $rc =  system $command;
+exit $rc >> 8;