Changeset 35594

Timestamp:

May 24, 2013, 1:37:30 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/include/addstar.h (modified) (1 diff)
• Ohana/src/addstar/src/ImageIndex.c (modified) (1 diff)
• Ohana/src/addstar/src/UpdateImageIDs.c (modified) (2 diffs)
• Ohana/src/addstar/src/args.c (modified) (2 diffs)
• Ohana/src/dvomerge (modified) (1 prop)
• Ohana/src/dvomerge/include/dvomerge.h (modified) (1 diff)
• Ohana/src/dvomerge/src/args.c (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvomerge.c (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvomergeFromList.c (modified) (1 diff)
• Ohana/src/dvomerge/src/dvomergeUpdate.c (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c (modified) (1 diff)
• Ohana/src/dvomerge/src/help.c (modified) (2 diffs)
• Ohana/src/dvopsps/include/dvopsps.h (modified) (1 diff)
• Ohana/src/dvopsps/src/DetectionOps.c (modified) (8 diffs)
• Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c (modified) (4 diffs)
• Ohana/src/libfits/include/gfitsio.h (modified) (1 diff)
• Ohana/src/libfits/table/F_define_column.c (modified) (1 diff)
• Ohana/src/libohana/src (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)
• Ohana/src/relastro/src (modified) (1 prop)
• dbconfig/cam.md (modified) (1 prop)
• dbconfig/changes.txt (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/publish_file.pl (modified) (1 prop)
• ippScripts/scripts/warp_skycell.pl (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_find_rawexp.sql (modified) (1 diff)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/laptool_definerunbyrelease.sql (copied) (copied from trunk/ippTools/share/laptool_definerunbyrelease.sql )
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/chiptool.c (modified) (2 diffs)
• ippTools/src/chiptoolConfig.c (modified) (1 diff)
• ippTools/src/laptool.c (modified) (3 diffs)
• ippTools/src/laptool.h (modified) (1 diff)
• ippTools/src/laptoolConfig.c (modified) (2 diffs)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/gpc1/psphot.config (modified) (1 prop)
• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ippconfig/recipes/ppSub.config (modified) (1 diff, 1 prop)
• ippconfig/recipes/psphot.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (2 diffs, 1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/detrend/pmDark.c (modified) (3 diffs)
• psModules/src/objects/models/pmModel_TRAIL.c (modified) (1 diff)
• psconfig (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/pstamp_save_server_status.pl (modified) (2 diffs)
• pstamp/test/maketestreq (modified) (3 diffs)
• psvideophot (modified) (1 prop)
• pswarp/src/pswarpUpdateStatistics.c (modified) (1 diff)
• tools/dvodb_calib (copied) (copied from trunk/tools/dvodb_calib )
• tools/dvodb_calib/README (copied) (copied from trunk/tools/dvodb_calib/README )
• tools/dvodb_calib/gene.run.relastro (copied) (copied from trunk/tools/dvodb_calib/gene.run.relastro )
• tools/dvodb_calib/gene.run.relastro.part1 (copied) (copied from trunk/tools/dvodb_calib/gene.run.relastro.part1 )
• tools/dvodb_calib/gene.run.relastro.part1. (copied) (copied from trunk/tools/dvodb_calib/gene.run.relastro.part1. )
• tools/dvodb_calib/gene.run.relastro.part2 (copied) (copied from trunk/tools/dvodb_calib/gene.run.relastro.part2 )
• tools/dvodb_calib/gene.run.relphot (copied) (copied from trunk/tools/dvodb_calib/gene.run.relphot )
• tools/dvodb_calib/run.addstar.resort (copied) (copied from trunk/tools/dvodb_calib/run.addstar.resort )
• tools/dvodb_calib/run.relastro.part1 (copied) (copied from trunk/tools/dvodb_calib/run.relastro.part1 )
• tools/dvodb_calib/run.relastro.part2 (copied) (copied from trunk/tools/dvodb_calib/run.relastro.part2 )
• tools/dvodb_calib/run.relphot (copied) (copied from trunk/tools/dvodb_calib/run.relphot )
• tools/dvodb_calib/run.setphot (copied) (copied from trunk/tools/dvodb_calib/run.setphot )

branches/eam_branches/ipp-20130509/Ohana/src/addstar/include/addstar.h

@@ -119 +119 @@
 int     ACCEPT_TIME;    // accept time stamp (or 0)
 int     NO_STARS;       // ignore the stars
+int     NO_DUPLICATE_IMAGES; // allow / skip duplicate images 
+int     IMAGE_ID_OVERRIDE; // allow / skip duplicate images 
 int     TEXTMODE;       // force input file to be loaded as RAW
 int     SUBPIX;         // apply a subpix correction

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/ImageIndex.c

@@ -159 +159 @@
   if (!index) {
       fprintf (stderr, "image index file is not found, cannot check for image duplicates\n");
-      exit (2);
+      exit (1);
   }
 

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -35 +35 @@
   }
 
+  // TEST IMAGE_ID OVER-RIDE:
+  if (IMAGE_ID_OVERRIDE) {
+    imageID = IMAGE_ID_OVERRIDE;
+  }
+
   // XXX should the first image ID be 1, not 0?
   if (imageID == 0) imageID = 1;
@@ -54 +59 @@
   // set and update the imageID sequence
   // the file holding the index is created above if this is an empty db
-  CheckDuplicateImageIDs (images, Nimages);
+  if (NO_DUPLICATE_IMAGES) {
+    CheckDuplicateImageIDs (images, Nimages);
+  }
 
   imageID += Nimages;

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/args.c

@@ -308 +308 @@
   if ((N = get_argument (argc, argv, "-no-stars"))) {
     NO_STARS = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  /* skip the stars */
+  NO_DUPLICATE_IMAGES = TRUE;
+  if ((N = get_argument (argc, argv, "-dup-images"))) {
+    NO_DUPLICATE_IMAGES = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+  /* skip the stars */
+  IMAGE_ID_OVERRIDE = 0;
+  if ((N = get_argument (argc, argv, "-image-id-override"))) {
+    remove_argument (N, &argc, argv);
+    IMAGE_ID_OVERRIDE = atoi(argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -438 +451 @@
   fprintf (stderr, "  -use-name                   : use the given name instead of the filename as the filename\n");
   fprintf (stderr, "  -no-stars                   : skip the stars\n");
+  fprintf (stderr, "  -dup-images                 : skip the test for duplicate image IDs (test only!)\n");
   fprintf (stderr, "  -force                      : force read of database with inconsistent info\n");
   fprintf (stderr, "  -threads (N)                : use N threads for resort option\n");

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/include/dvomerge.h

@@ -25 +25 @@
 
 int    VERBOSE;
+int    VERIFY;
+int    IMAGES_ONLY;
 char   CATDIR[256];
 char   GSCFILE[256];

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/args.c

@@ -12 +12 @@
     remove_argument (N, argc, argv);
   }
+
+  /* verify merge status of output tables, but do not modify */
+  VERIFY = FALSE;
+  if ((N = get_argument (*argc, argv, "-verify"))) {
+    VERIFY = TRUE;
+    remove_argument (N, argc, argv);
+  }
+  if ((N = get_argument (*argc, argv, "-check-only"))) {
+    VERIFY = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
+  /* use a different photcode file to define mean values */
   if ((N = get_argument (*argc, argv, "-photcode-file"))) {
     remove_argument (N, argc, argv);
@@ -113 +126 @@
   }
 
+  /* verify merge status of output tables, but do not modify */
+  VERIFY = FALSE;
+  if ((N = get_argument (*argc, argv, "-verify"))) {
+    VERIFY = TRUE;
+    remove_argument (N, argc, argv);
+  }
+  if ((N = get_argument (*argc, argv, "-check-only"))) {
+    VERIFY = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
   /* replace measurement, don't duplicate */
   REPLACE_BY_PHOTCODE = FALSE;

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomerge.c

@@ -10 +10 @@
   if (argc == 6) {
     if (!strcasecmp (argv[2], "and")) {
+      if (VERIFY) {
+        fprintf (stderr, "WARNING / ERROR : dvomerge (input1) and (input2) into (output) : VERIFY mode not implemented\n");
+        exit (3);
+      }
       dvomergeCreate (argc, argv);
     } else {
+      if (VERIFY) {
+        fprintf (stderr, "WARNING / ERROR : dvomerge (input) into (output) from (list) : VERIFY mode not implemented\n");
+        exit (3);
+      }
       dvomergeFromList (argc, argv);
     }
@@ -26 +34 @@
 }
 
-/* we have two possible modes of operation:
+/* we have two major modes of operation:
 
-   Create   : dvomerge (in1) and (in2) to (out) -- create a new db from two input dbs
-   Update   : dvomerge (in) into (out)          -- merge a new db into an existing db
-   Continue : dvomerge (in) into (out) continue -- merge a new db into an existing db
+   Create    : dvomerge (in1) and (in2) to (out) -- create a new db from two input dbs
+   Update    : dvomerge (in) into (out)          -- merge a new db into an existing db
 
+   we also have varients on Update:
+   Continue  : dvomerge (in) into (out) continue -- merge only unmerged tables into the existing db
+   From List : dvomerge (in) into (out) from (list) -- merge only specified tables into the existing db
+
+   neither of the 2 above modes update the image table
 */

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomergeFromList.c

@@ -108 +108 @@
     dmhObjectStats *inStats = dmhObjectStatsRead (inputfile);
 
+    // XXX : we are not checking for already-merged entries
+
     LoadCatalog (&incatalog, NULL, inputfile, "r", NsecfiltInput);
 

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -23 +23 @@
     CONTINUE = TRUE;
   }
+  if (VERIFY) CONTINUE = TRUE;
 
   input  = argv[1];
@@ -78 +79 @@
   } else {
     dvomergeImagesUpdate (&IDmap, input, output);
+    if (IMAGES_ONLY) exit (0);
   }
 

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -76 +76 @@
     }
     if (!missed) {
-      if (VERBOSE) fprintf (stderr, "skipping %s, empty or already merged\n", inlist[0].filename[i]);
+      if (VERBOSE || VERIFY) fprintf (stderr, "skipping %s, already merged\n", inlist[0].filename[i]);
       OutputStatusFree (outstat, outlist->Nregions);
       dmhObjectStatsFree (inStats);
       SkyListFree (outlist); 
+      continue;
+    }
+    if (VERIFY) { 
+      fprintf (stderr, "%s NOT merged\n", inlist[0].filename[i]);
       continue;
     }
@@ -193 +197 @@
     char tmpline[DVO_MAX_PATH];
     if (VERBOSE)             { snprintf (tmpline, DVO_MAX_PATH, "%s -v",       command); strcpy (command, tmpline); }
+    if (VERIFY)              { snprintf (tmpline, DVO_MAX_PATH, "%s -verify",  command); strcpy (command, tmpline); }
     if (REPLACE_BY_PHOTCODE) { snprintf (tmpline, DVO_MAX_PATH, "%s -replace", command); strcpy (command, tmpline); }
 

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c

@@ -129 +129 @@
   output = argv[3];
 
+  fprintf (stderr, "WARNING / ERROR : multi-threaded dvomerge does not handle merge tracking yet\n");
+  exit (2);
+
   if (ALTERNATE_PHOTCODE_FILE) {
     fprintf (stderr, "cannot specify photcodes when merging into an existing catdir\n");

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/help.c

@@ -59 +59 @@
   fprintf (stderr, "  optional flags:\n");
   fprintf (stderr, "  -v                          : verbose mode\n");
+  fprintf (stderr, "  -verify                     : verify merge status of output tables, but do not modify\n");
+  fprintf (stderr, "  -check-only                 : verify merge status of output tables, but do not modify [same as -verify]\n");
   fprintf (stderr, "  -help                       : this list\n");
   fprintf (stderr, "  -h                          : this list\n\n");
@@ -81 +83 @@
   fprintf (stderr, "  optional flags:\n");
   fprintf (stderr, "  -v                          : verbose mode\n");
+  fprintf (stderr, "  -verify                     : verify merge status of output tables, but do not modify\n");
+  fprintf (stderr, "  -check-only                 : verify merge status of output tables, but do not modify [same as -verify]\n");
   fprintf (stderr, "  -help                       : this list\n");
   fprintf (stderr, "  -h                          : this list\n\n");

branches/eam_branches/ipp-20130509/Ohana/src/dvopsps/include/dvopsps.h

@@ -13 +13 @@
   uint64_t ippObjID;
   uint64_t objID;
+  int      photcode;
   unsigned int flags;
   float zp;

branches/eam_branches/ipp-20130509/Ohana/src/dvopsps/src/DetectionOps.c

@@ -54 +54 @@
   GET_COLUMN(ippObjID    , "ippObjID",    int64_t);
   GET_COLUMN(objID       , "objID",       int64_t);
+  GET_COLUMN(photcode    , "photcode",    int);
   GET_COLUMN(flags       , "flags",       int);
   GET_COLUMN(zp          , "zp",          float);
@@ -73 +74 @@
     detections[i].ippObjID     = ippObjID[i];   
     detections[i].objID        = objID[i];      
+    detections[i].photcode     = photcode[i];      
     detections[i].flags        = flags[i];      
     detections[i].zp           = zp[i];         
@@ -90 +92 @@
   free (ippObjID   );
   free (objID      );
+  free (photcode   );
   free (flags      );
   free (zp         );
@@ -154 +157 @@
   // gfits_define_bintable_column (&theader, "K", "ippObjID",    NULL, NULL, 1.0, BZERO_INT64);
   // gfits_define_bintable_column (&theader, "K", "objID",       NULL, NULL, 1.0, BZERO_INT64);
+  gfits_define_bintable_column (&theader, "J", "photcode",    NULL, NULL, 1.0, 0.0);
   gfits_define_bintable_column (&theader, "J", "flags",       NULL, NULL, 1.0, BZERO_INT32);
   gfits_define_bintable_column (&theader, "E", "zp",          NULL, NULL, 1.0, 0.0);
@@ -173 +177 @@
   uint64_t   *ippObjID    ; ALLOCATE (ippObjID    ,  uint64_t, Ndetections);
   uint64_t   *objID       ; ALLOCATE (objID       ,  uint64_t, Ndetections);
+  int        *photcode    ; ALLOCATE (photcode    ,  int,      Ndetections);
   uint32_t   *flags       ; ALLOCATE (flags       ,  uint32_t, Ndetections);
   float      *zp          ; ALLOCATE (zp          ,  float,    Ndetections);
@@ -190 +195 @@
     ippObjID[i]    = detections[i].ippObjID    ;
     objID[i]       = detections[i].objID       ;
+    photcode[i]    = detections[i].photcode    ;
     flags[i]       = detections[i].flags       ;
     zp[i]          = detections[i].zp          ;
@@ -207 +213 @@
   gfits_set_bintable_column (&theader, &ftable, "ippObjID",    ippObjID    , Ndetections);
   gfits_set_bintable_column (&theader, &ftable, "objID",       objID       , Ndetections);
+  gfits_set_bintable_column (&theader, &ftable, "photcode",    photcode    , Ndetections);
   gfits_set_bintable_column (&theader, &ftable, "flags",       flags       , Ndetections);
   gfits_set_bintable_column (&theader, &ftable, "zp",          zp          , Ndetections);
@@ -222 +229 @@
   free (ippObjID    );
   free (objID       );
+  free (photcode    );
   free (flags       );
   free (zp          );

branches/eam_branches/ipp-20130509/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -49 +49 @@
       // detections[Ndetections]. ((uint64_t)average->catID << 32) + (uint64_t)average->objID; // ippObjID
       detections[Ndetections].objID        = average->extID;   // objID
+      detections[Ndetections].photcode     = measure->photcode;   // photcode
       detections[Ndetections].flags        = measure->dbFlags;  // flags
       detections[Ndetections].zp           = code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal;   // zp
@@ -168 +169 @@
   }
 
-  PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (imageID, ippDetectID, detectID, ippObjID, objID, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
+  PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (imageID, ippDetectID, detectID, ippObjID, objID, photcode, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
 
   return TRUE;
@@ -179 +180 @@
 int insert_detections_mysql_value (IOBuffer *buffer, Average *average, Measure *measure) {
 
-  // XXX I am changing the def of ippObjID if I use the code below
   PhotCode *code = GetPhotcodebyCode(measure->photcode);
-  // PrintIOBuffer (buffer, "    (%d, %u, %lu, %lu, %lu, %u, %f, %f, %f, %f, %lf, %lf, %f, %f),\n",
-  //             measure->imageID,    // imageID
-  //             measure->detID,   // ippDetectID
-  //             measure->extID,   // detectID
-  //             ((uint64_t)average->catID * 1000000000) + (uint64_t)average->objID, // ippObjID
-  //             // NOTE: this is better, but the above is the current ippToPsps value
-  //             // ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
-  //             average->extID,   // objID
-  //             measure->dbFlags,  // flags
-  //             code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal,   // zp
-  //             measure->dMcal,    // zpErr
-  //             measure->airmass,
-  //             pow(10.0, 0.4 * measure->dt),    // expTime
-  //             average->R - measure->dR / 3600.,    // ra
-  //             average->D - measure->dR / 3600.,    // dec
-  //             measure->dXccd * 0.01 * fabs(measure->pltscale), // estimate of raErr
-  //             measure->dYccd * 0.01 * fabs(measure->pltscale) // estimate of decErr
-  //   ); 
-  
   PrintIOBuffer (buffer, "(%d, ", measure->imageID);      // imageID
   PrintIOBuffer (buffer, "%u, ", measure->detID); // ippDetectID
@@ -207 +188 @@
   // ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
   PrintIOBuffer (buffer, "%lu, ", average->extID);        // objID
+  PrintIOBuffer (buffer, "%d, ", measure->photcode);      // photcode
   PrintIOBuffer (buffer, "%u, ", measure->dbFlags);       // flags
 

branches/eam_branches/ipp-20130509/Ohana/src/libfits/include/gfitsio.h

@@ -26 +26 @@
 # define FT_LINE_LENGTH          80  /* FITS header line length */
 # define FT_RECORD_SIZE        2880  /* FITS block size */
+
+# define FT_BZERO_INT16 1.0*0x8000        
+# define FT_BZERO_INT32 1.0*0x80000000
 
 /* this structure defines the buffer which contains a header

branches/eam_branches/ipp-20130509/Ohana/src/libfits/table/F_define_column.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+
+# if (0)
+/*** special version of this function to define unsigned int columns (special values for BZERO, BSCALE) ********************/
+int gfits_define_bintable_column_unsigned_int (Header *header, char *format, char *label, char *comment, char *unit, int inttype) {
+
+  assert (label);
+  assert (format);
+
+  off_t Naxis1;
+  int Nfields, Nbytes, Nval;
+  char type[16], field[16];
+  
+  if (!gfits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
+  
+  Nfields = 0;
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1,  &Naxis1);
+  Nfields ++;
+  Naxis1 += Nbytes*Nval;
+
+  sprintf (field, "TTYPE%d", Nfields);
+  gfits_modify (header, field, "%s", 1, label);
+  gfits_modify_alt (header, field, "%C", 1, comment);
+  sprintf (field, "TUNIT%d", Nfields);
+  gfits_modify (header, field, "%s", 1, unit);
+  sprintf (field, "TFORM%d", Nfields);
+  gfits_modify (header, field, "%s", 1, format);
+
+  // add scaling parameters unless they amount to a noop
+  if ((bscale != 1.0) || (bzero != 0.0)) {
+      sprintf (field, "TSCAL%d", Nfields);
+      gfits_modify (header, field, "%lf", 1, bscale);
+      sprintf (field, "TZERO%d", Nfields);
+      gfits_modify (header, field, "%lf", 1, bzero);
+  }
+
+  /* update TFIELDS & NAXIS1 */
+  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
+  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1,  Naxis1);
+  header[0].Naxis[0] = Naxis1;
+
+  return (TRUE);
+}
+# endif
 
 /***********************/

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

@@ -449 +449 @@
         diffphottool_data.sql \
         laptool_definerun.sql \
+        laptool_definerunbyrelease.sql \
         laptool_exposures.sql \
         laptool_inactiveexp.sql \

branches/eam_branches/ipp-20130509/ippTools/share/chiptool_find_rawexp.sql

@@ -6 +6 @@
 FROM rawExp
 JOIN newExp using (exp_id)
-LEFT JOIN chipRun USING (exp_id)
+LEFT JOIN chipRun ON chipRun.exp_id = rawExp.exp_id -- JOIN hook %s
 WHERE
     rawExp.fault = 0

branches/eam_branches/ipp-20130509/ippTools/src/chiptool.c

@@ -269 +269 @@
 
     PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", true, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", true, false);
     PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
     PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false);
@@ -298 +298 @@
     psFree(where);
 
+    psString labelHook = NULL;
     if (unique) {
-      psStringAppend(&query, "AND chip_id IS NULL");
+      psStringAppend(&labelHook, "\nAND chipRun.label = '%s'", label);
+      psStringAppend(&query, " AND chip_id IS NULL");
     }
     
-    if (!p_psDBRunQuery(config->dbh, query)) {
+    if (!p_psDBRunQueryF(config->dbh, query, labelHook ? labelHook : "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);

branches/eam_branches/ipp-20130509/ippTools/src/chiptoolConfig.c

@@ -52 +52 @@
 
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",  0,            "define workdir (required)", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label (required)", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction",  0,            "define reduction class", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup",  0,            "define exposure group", NULL);

branches/eam_branches/ipp-20130509/ippTools/src/laptool.c

@@ -22 +22 @@
 // Run level
 static bool definerunMode(pxConfig *config);
+static bool definerunbyreleaseMode(pxConfig *config);
 static bool pendingrunMode(pxConfig *config);
 static bool updaterunMode(pxConfig *config);
+
 // Exposure level
 static bool pendingexpMode(pxConfig *config);
@@ -64 +66 @@
     
     MODECASE(LAPTOOL_MODE_DEFINERUN,     definerunMode);
+    MODECASE(LAPTOOL_MODE_DEFINERUNBYRELEASE, definerunbyreleaseMode);
     MODECASE(LAPTOOL_MODE_PENDINGRUN,    pendingrunMode);
     MODECASE(LAPTOOL_MODE_UPDATERUN,     updaterunMode);
@@ -401 +404 @@
 }
 
+static bool definerunbyreleaseMode(pxConfig *config)
+{
+  PS_ASSERT_PTR_NON_NULL(config, false);
+
+  PXOPT_LOOKUP_S64(seq_id,          config->args, "-seq_id",          true, false);
+  PXOPT_LOOKUP_STR(projection_cell, config->args, "-projection_cell", true, false);
+  PXOPT_LOOKUP_STR(tess_id,         config->args, "-tess_id",         true, false);
+  PXOPT_LOOKUP_STR(filter,          config->args, "-filter",          true, false);
+  PXOPT_LOOKUP_STR(label,           config->args, "-label",           false, false);
+  PXOPT_LOOKUP_STR(dist_group,      config->args, "-dist_group",      false, false);
+  PXOPT_LOOKUP_S64(rel_id,          config->args, "-rel_id",          false, false);
+  PXOPT_LOOKUP_STR(rel_name,        config->args, "-release_name",    false, false);
+  PXOPT_LOOKUP_BOOL(simple,         config->args, "-simple",          false);
+
+  // Validate config
+  if ((!rel_name)&&(!rel_id)) {
+    // Die here.
+  }
+  
+  lapRunRow *run = lapRunRowAlloc(0, // lap_id
+                                  seq_id,
+                                  tess_id,
+                                  projection_cell,
+                                  filter,
+                                  "registered", // state
+                                  label,
+                                  dist_group,
+                                  NULL, // registered
+                                  0,    // fault
+                                  INT64_MAX,    // quick_sass_id
+                                  INT64_MAX     // final_sass_id
+                                  );
+  if (!run) {
+    psError(PS_ERR_UNKNOWN, false, "failed to alloc lapRun object");
+    return(true);
+  }
+
+  if (!psDBTransaction(config->dbh)) {
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    return(false);
+  }
+    
+  if (!lapRunInsertObject(config->dbh, run)) {
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    psFree(run);
+    return(false);
+  }
+
+  if (!lapRunPrintObject(stdout, run, !simple)) {
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+    psError(PS_ERR_UNKNOWN, false, "failed to print object");
+    psFree(run);
+    return(false);
+  }
+
+  psS64 lap_id = psDBLastInsertID(config->dbh);
+
+  psString query = pxDataGet("laptool_definerunbyrelease.sql");
+  if (!query) {
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+    psError(PXTOOLS_ERR_SYS, false, "failed to retrieve SQL statement");
+    return(false);
+  }
+  
+  // Add constraints
+  psMetadata *relWhere = psMetadataAlloc();
+  PXOPT_COPY_STR(config->args, relWhere, "-filter",       "rawExp.filter", "==");
+  PXOPT_COPY_STR(config->args, relWhere, "-release_name", "ippRelease.release_name", "==");
+  PXOPT_COPY_S64(config->args, relWhere, "-rel_id",       "ippRelease.rel_id", "==");
+  PXOPT_COPY_TIME(config->args, relWhere, "-dateobs_begin", "rawExp.dateobs", ">=");
+  PXOPT_COPY_TIME(config->args, relWhere, "-dateobs_end", "rawExp.dateobs", "<=");
+  PXOPT_COPY_RADEC(config->args, relWhere, "-ra_min", "rawExp.ra", ">=");
+  PXOPT_COPY_RADEC(config->args, relWhere, "-ra_max", "rawExp.ra", "<");
+  PXOPT_COPY_RADEC(config->args, relWhere, "-decl_min", "rawExp.decl", ">=");
+  PXOPT_COPY_RADEC(config->args, relWhere, "-decl_max", "rawExp.decl", "<");
+
+  psMetadata *lapWhere = psMetadataAlloc();
+  PXOPT_COPY_S64(config->args, lapWhere, "-seq_id",       "lapRun.seq_id", "==");
+  PXOPT_COPY_STR(config->args, lapWhere, "-filter",       "lapRun.filter", "==");
+
+  psString relWhereClause = psDBGenerateWhereConditionSQL(relWhere,NULL);
+  psString lapWhereClause = psDBGenerateWhereConditionSQL(lapWhere,NULL);
+
+  if (relWhereClause) {
+    psStringSubstitute(&query,relWhereClause,"@RELWHERE@");
+  }
+  if (lapWhereClause) {
+    psStringSubstitute(&query,lapWhereClause,"@LAPWHERE@");
+  }
+  psFree(relWhere);
+  psFree(lapWhere);
+
+  // Fetch exposures
+  if (!p_psDBRunQuery(config->dbh, query)) {
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    psFree(query);
+    return(false);
+  }
+  psFree(query);
+
+  psArray *output = p_psDBFetchResult(config->dbh);
+  if (!output) {
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    return(false);
+  }
+  if (!psArrayLength(output)) {
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+
+    psTrace("laptool", PS_LOG_INFO, "no rows found");
+    psFree(output);
+    return(true);
+  }
+
+  // Insert the exposure data
+  for (long i = 0; i < output->n; i++) {
+    psMetadata *row = output->data[i]; // Row from select
+    // Add default values from this run:
+    psMetadataAddS64(row, PS_LIST_TAIL, "lap_id", 0, "", lap_id);
+    psMetadataAddS64(row, PS_LIST_TAIL, "pair_id", 0, "", INT64_MAX);
+    psMetadataAddStr(row, PS_LIST_TAIL, "data_state", 0, "", "new");
+    lapExpRow *lapExp = lapExpObjectFromMetadata(row);
+    lapExp->lap_id = lap_id;
+
+    if (!lapExpInsertObject(config->dbh,lapExp)) {
+      if (!lapExpPrintObject(stdout, lapExp, !simple)) {
+        if (!psDBRollback(config->dbh)) {
+          psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to print object");
+        psFree(run);
+        return false;
+      }
+      
+      if (!psDBRollback(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+      }
+      psError(PS_ERR_UNKNOWN, false, "database error");
+      psFree(output);
+      psFree(lapExp);
+      return(false);
+    }
+  }
+
+  // point of no return
+  if (!psDBCommit(config->dbh)) {
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    return false;
+  }
+
+  
+  psFree(output);
+  return(true);  
+}
+
+
+  
+  
+                   
 static bool pendingrunMode(pxConfig *config)
 {

branches/eam_branches/ipp-20130509/ippTools/src/laptool.h

@@ -13 +13 @@
   LAPTOOL_MODE_LISTSEQUENCE,
   LAPTOOL_MODE_DEFINERUN,
+  LAPTOOL_MODE_DEFINERUNBYRELEASE,
   LAPTOOL_MODE_PENDINGRUN,
   LAPTOOL_MODE_UPDATERUN,

branches/eam_branches/ipp-20130509/ippTools/src/laptoolConfig.c

@@ -57 +57 @@
   ADD_OPT(Str, definerunArgs, "-label",                       "define the label used", NULL);
   ADD_OPT(Str, definerunArgs, "-dist_group",                  "define the distribution group for this data", NULL);
-
+  
   psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-obsmode", PS_META_DUPLICATE_OK, "search by obsmode", NULL);
   ADD_OPT(Bool,definerunArgs, "-all_obsmode",                 "use all science obsmodes", false);
   
   ADD_OPT(Bool,definerunArgs, "-simple",                      "use the simple output format", false);
+
+  // -definerunbyrelease
+  psMetadata *definerunbyreleaseArgs = psMetadataAlloc();
+  ADD_OPT(S64, definerunbyreleaseArgs, "-seq_id",             "define the LAP sequence for this run (required)", 0);
+  ADD_OPT(Str, definerunbyreleaseArgs, "-projection_cell",    "define the projection cell for this run (required)", NULL);
+  ADD_OPT(Str, definerunbyreleaseArgs, "-tess_id",            "define the tessellation used (required)", NULL);
+  ADD_OPT(Str, definerunbyreleaseArgs, "-filter",             "define the filter used (required)", NULL);
+  ADD_OPT(Str, definerunbyreleaseArgs, "-label",              "define the label used", NULL);
+  ADD_OPT(Str, definerunbyreleaseArgs, "-dist_group",         "define the distribution group for this data", NULL);
+  ADD_OPT(S64, definerunbyreleaseArgs, "-rel_id",             "define the release to copy", 0);
+  ADD_OPT(Str, definerunbyreleaseArgs, "-release_name",       "define the release to copy", NULL);
+  
+  ADD_OPT(Bool, definerunbyreleaseArgs, "-simple",            "use the simple output format", false);
+  psMetadataAddTime(definerunbyreleaseArgs, PS_LIST_TAIL, "-dateobs_begin",      0, "search for exposures by time (>=)", NULL);
+  psMetadataAddTime(definerunbyreleaseArgs, PS_LIST_TAIL, "-dateobs_end",        0, "search for exposures by time (<=)", NULL);
+  psMetadataAddF64(definerunbyreleaseArgs,  PS_LIST_TAIL, "-ra_min",             0, "search by min RA (degrees) ", NAN);
+  psMetadataAddF64(definerunbyreleaseArgs,  PS_LIST_TAIL, "-ra_max",             0, "search by max RA (degrees) ", NAN);
+  psMetadataAddF64(definerunbyreleaseArgs,  PS_LIST_TAIL, "-decl_min",           0, "search by min DEC (degrees)", NAN);
+  psMetadataAddF64(definerunbyreleaseArgs,  PS_LIST_TAIL, "-decl_max",           0, "search by max DEC (degrees)", NAN);
   
   // -pendingrun
@@ -204 +223 @@
   PXOPT_ADD_MODE("-listsequence",            "", LAPTOOL_MODE_LISTSEQUENCE,     listsequenceArgs);
   PXOPT_ADD_MODE("-definerun",               "", LAPTOOL_MODE_DEFINERUN,        definerunArgs);
+  PXOPT_ADD_MODE("-definerunbyrelease",      "", LAPTOOL_MODE_DEFINERUNBYRELEASE, definerunbyreleaseArgs);
   PXOPT_ADD_MODE("-pendingrun",              "", LAPTOOL_MODE_PENDINGRUN,       pendingrunArgs);
   PXOPT_ADD_MODE("-listrun",                 "", LAPTOOL_MODE_PENDINGRUN,       listrunArgs);

branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppStack.config

@@ -81 +81 @@
 END
 
-STACK_ALLDEEP    METADATA                  # N>>20 inputs, typically MD fields, no cuts
+
+STACK_MD_REF       METADATA  ## revised config for MD refstacks vs PS1_REFERENCE above after ppStack mods 5/03/13
     OUTPUT.NOCOMP           BOOL  TRUE
     OUTPUT.LOGFLUX          BOOL  FALSE
     OUTPUT.REPLICATE        BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK  ## needed?
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   6.0   # never really want >6 pixels in refstack
+    PSF.INPUT.CLIP.NSIGMA   F32   1.0   # sample typically on rising side of distribution (set even smaller?)
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+    MATCH.REJ               F32   4.0 # need ot tune?
+    SAFE                    BOOL  FALSE
+END
+
+STACK_MD_DEEP     METADATA   ## revised config for MD deepstack above after ppStack mods 5/03/13
+    OUTPUT.NOCOMP           BOOL  TRUE
+    OUTPUT.LOGFLUX          BOOL  FALSE
+    OUTPUT.REPLICATE        BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK 
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   10.0
+    PSF.INPUT.CLIP.NSIGMA   F32   100.0 
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+    MATCH.REJ               F32   4.0 # need ot tune?
+    SAFE                    BOOL  FALSE
+END
+
+STACK_ALLDEEP      METADATA     # no cuts, everything in changes after ppStack mods 5/03/13
+    OUTPUT.NOCOMP           BOOL  TRUE
+    OUTPUT.LOGFLUX          BOOL  FALSE
+    OUTPUT.REPLICATE        BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK 
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   100.0
+    PSF.INPUT.CLIP.NSIGMA   F32   100.0
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+    MATCH.REJ               F32   4.0 # need ot tune?
+    SAFE                    BOOL  FALSE
 END
 

branches/eam_branches/ipp-20130509/ippconfig/recipes/ppStack.config

@@ -164 +164 @@
 END
 
+STACK_MD_REF    METADATA
+END
+
+STACK_MD_DEEP   METADATA
+END
+
 STACK_ALLDEEP   METADATA
 END
+
+
+
 
 TEST1 METADATA

branches/eam_branches/ipp-20130509/ippconfig/recipes/ppSub.config

@@ -108 +108 @@
 END
 
+# test setup for nodual case
+DIFF_NODUAL    METADATA   
+        DUAL             BOOL    FALSE    # Dual convolution?
+        INVERSE          BOOL    TRUE    # Generate inverse subtraction?
+        PHOTOMETRY       BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET  STR     SINGLE_AUTO
+
+        @ISIS.WIDTHS    F32     1.5  3.0  6.0   # Gaussian kernel FWHM values
+        @ISIS.ORDERS    S32     6    4    2     # Polynomial orders for ISIS kernels
+
+        SCALE.REF       F32     5.0             # FWHM reference for kernel parameter scaling
+        KERNEL.SIZE     S32     20              # Kernel half-size (pixels)
+        STAMP.FOOTPRINT S32     20              # Size of stamps (pixels)
+END
+
 # Difference of two warps
 WARPWARP        METADATA

branches/eam_branches/ipp-20130509/ippconfig/recipes/reductionClasses.mdc

@@ -299 +299 @@
 END
 
+# sweetspot no dual test case
+SWEETSPOT_NODUAL            METADATA
+        DIFF_PPSUB        STR     DIFF_NODUAL
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+END
 
 CONSTANT_WEIGHTPHOT             METADATA
@@ -544 +551 @@
 END
 
+## MD refstack
+MD_REF_STACK            METADATA
+      STACK_PPSTACK           STR     STACK_MD_REF
+      STACK_PPSUB             STR     STACK
+      STACK_PSPHOT            STR     STACK
+      STACKPHOT_PSPHOT        STR     STACKPHOT
+      STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL 
+END
+
+## MD deepstack
+MD_DEEP_STACK            METADATA
+      STACK_PPSTACK           STR     STACK_MD_DEEP
+      STACK_PPSUB             STR     STACK
+      STACK_PSPHOT            STR     STACK
+      STACKPHOT_PSPHOT        STR     STACKPHOT
+      STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL 
+END
 
 # quick stacks

branches/eam_branches/ipp-20130509/psModules/src/detrend/pmDark.c

@@ -383 +383 @@
       }
       values_set->data[i] = values;
-    }
-
+      psFree(orders);
+    }
+      
     // retrieve the norm vector, if supplied
     psVector *norm       = psMetadataLookupPtr(&mdok, output->analysis, "DARK.NORM");
@@ -433 +434 @@
                 }
                 pmReadout *readout = inputs->data[r]; // Input readout
+                if ((!readout)||(!readout->image)) {
+                  mask->data.PS_TYPE_VECTOR_MASK_DATA[r] = 0xff;
+                  continue;
+                }                 
                 int yIn = i - readout->row0; // y position on input readout
                 int xIn = j - readout->col0; // x position on input readout
@@ -504 +509 @@
     psFree(mask);
 
+    for (int i = 0; i < max_orders->n; i++) {
+      psFree(poly_set->data[i]);
+      psArray *values = values_set->data[i];
+      for (int j = 0; j < values->n; j++) {
+        psFree(values->data[j]);
+      }
+      psFree(values_set->data[i]);
+    }
+    psFree(values_set);
+    psFree(poly_set);
+    psFree(logL);
+
     return true;
 }

branches/eam_branches/ipp-20130509/psModules/src/objects/models/pmModel_TRAIL.c

@@ -169 +169 @@
         dPAR[PM_PAR_SIGMA]  = 0;        // we don't actually allow this to vary, so we do not need to calculate it
 
-        for (int i = 0; i < 7; i++) {
-          if (isnan(dPAR[i])) {
-            fprintf (stderr, "*");
-          }
-        }
-    }
-    if (isnan(f)) {
-      fprintf (stderr, "!");
-    }
+        //      for (int i = 0; i < 7; i++) {
+        //        if (isnan(dPAR[i])) {
+        //          fprintf (stderr, "*");
+        //        }
+        //      }
+    }
+    //    if (isnan(f)) {
+    //      fprintf (stderr, "!");
+    //    }
     return(f);
 }

branches/eam_branches/ipp-20130509/pstamp/scripts/pstamp_save_server_status.pl

@@ -12 +12 @@
 use Pod::Usage qw( pod2usage );
 
-# XXX: We should get this from site.config, but that would about double
-# the execution time for this script.
-my $rundir = "/data/ippc17.0/pstamp";
-
-my $status_file = "$rundir/web/status.html";
-
 my $updatelink;
 my $verbose;
 my $save_temps;
+my $pstamp_workdir;
 
 GetOptions(
-    'rundir=s'      => \$rundir,
+    'workdir=s'      => \$pstamp_workdir,
     'update-link'    => \$updatelink,
     'verbose'       => \$verbose,
@@ -37 +32 @@
 }
 
+if (!$pstamp_workdir) {
+    my $ipprc = PS::IPP::Config->new(); # IPP Configuration
+    $pstamp_workdir = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_WORKDIR');
+}
+
+if (!$pstamp_workdir) {
+    warn("Failed to find PSTAMP_WORKDIR in the config\n");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
+my $status_file = "$pstamp_workdir/server_status/status.html";
+
 my ($sec, $min, $hour, $mday, $month, $year) = gmtime;
 $year += 1900;
 $month += 1;
 
-my $dir = sprintf "$rundir/work/server_status/%4d/%02d/%02d", $year, $month, $mday;
+my $dir = sprintf "$pstamp_workdir/server_status/%4d/%02d/%02d", $year, $month, $mday;
 
 if (!-e $dir ) {

branches/eam_branches/ipp-20130509/pstamp/test/maketestreq

@@ -30 +30 @@
 }
 
-# XXX: get these from site.config
-$pstamptool .= " -dbserver ippc19 -dbname ippRequestServer";
-
 
 my ($input, $submit, $listfile, $delete, $simple, $tag_req_name, $req_name, $email);
+my ($dbname, $dbserver);
 my ($save_temps, $verbose);
 
@@ -50 +48 @@
     'label=s'           => \$label,
     'email=s'           => \$email,
+
+    'dbname=s'           => \$dbname,
+    'dbserver=s'         => \$dbserver,
 
     'listfile|l'        => \$listfile,
@@ -68 +69 @@
 die ("Input file $input not found\n") unless (-e $input);
 die ("Input file $input not readable\n") unless (-r $input);
+
+if (!$dbname or !$dbserver) {
+    my $ipprc = PS::IPP::Config->new('GPC1');
+
+    if (!$dbserver) {
+        $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
+        die ("couldn't find dbserver in site.config\n") unless $dbserver;
+    }
+    if (!$dbname) {
+        $dbname =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBNAME');
+        die ("couldn't find dbname in site.config\n") unless $dbname;
+    }
+}
+$pstamptool .= " -dbserver $dbserver -dbname $dbname";
+
 
 # if request name was not supplied make one

branches/eam_branches/ipp-20130509/pswarp/src/pswarpUpdateStatistics.c

@@ -73 +73 @@
               // skip empty output readouts
                 if (!readout->data_exists) {
-                  Nreadout ++;
                   continue;
                 }
+                Nreadout ++;
     
                 psString readoutName = NULL;