Changeset 29384

Timestamp:

Oct 12, 2010, 3:00:38 PM (16 years ago)

Author:

bills

Message:

postage stamp server updates from the trunk

Location:

tags/ipp-20100823

Files:

• ippconfig/recipes/filerules-mef.mdc (modified) (1 diff, 1 prop)
• ippconfig/recipes/filerules-simple.mdc (modified) (1 diff, 1 prop)
• ippconfig/recipes/filerules-split.mdc (modified) (1 diff, 1 prop)
• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (1 diff)
• pstamp/scripts/pstamp_webrequest.pl (modified) (3 diffs)
• pstamp/src (modified) (1 prop)
• pstamp/src/ppstamp.c (modified) (1 diff)
• pstamp/src/ppstamp.h (modified) (1 diff)
• pstamp/src/ppstampArguments.c (modified) (1 diff)
• pstamp/src/ppstampMakeStamp.c (modified) (1 diff)
• pstamp/src/ppstampOptions.h (modified) (1 diff)
• pstamp/src/ppstampParseCamera.c (modified) (3 diffs)

tags/ipp-20100823/ippconfig/recipes/filerules-mef.mdc

@@ -295 +295 @@
                                                                                      
 PPSTAMP.OUTPUT          OUTPUT {OUTPUT}.fits                     IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPSTAMP.OUTPUT.DIFF     OUTPUT {OUTPUT}.fits                     IMAGE     COMP_SUB   FPA        TRUE      NONE
 PPSTAMP.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits                  MASK      COMP_MASK  FPA        TRUE      NONE
 PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE

tags/ipp-20100823/ippconfig/recipes/filerules-simple.mdc

@@ -261 +261 @@
                                              
 PPSTAMP.OUTPUT               OUTPUT {OUTPUT}.fits                 IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTAMP.OUTPUT.DIFF          OUTPUT {OUTPUT}.fits                 IMAGE           COMP_SUB   FPA        TRUE      NONE
 PPSTAMP.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits              MASK            COMP_MASK  FPA        TRUE      NONE
 PPSTAMP.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits              VARIANCE        COMP_WT    FPA        TRUE      NONE

tags/ipp-20100823/ippconfig/recipes/filerules-split.mdc

@@ -280 +280 @@
 
 PPSTAMP.OUTPUT               OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTAMP.OUTPUT.DIFF          OUTPUT {OUTPUT}.fits                     IMAGE           COMP_SUB   FPA        TRUE      NONE
 PPSTAMP.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits                  MASK            COMP_MASK  FPA        TRUE      NONE
 PPSTAMP.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE

tags/ipp-20100823/pstamp/scripts/pstamp_job_run.pl

@@ -118 +118 @@
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
+    $command .= " -stage $params->{stage}" if $params->{stage};
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);

tags/ipp-20100823/pstamp/scripts/pstamp_webrequest.pl

@@ -26 +26 @@
 my $dbname;
 my $dbserver;
-my $project;
-my $job_type;
 
 GetOptions(
-    'job_type=s'    =>  \$job_type,
     'dbname=s'      =>  \$dbname,
     'dbserver=s'    =>  \$dbserver,
-#    'project=s'     => \$project,
     'verbose'       => \$verbose,
 );
@@ -42 +38 @@
     print "\n\n";
     print "Starting script $0 on $host\n\n";
-}
-
-my $listMode;
-if ($job_type and ($job_type eq 'list_uri')) {
-    $listMode=1;
-} else  {
-    $listMode=0;
 }
 
@@ -105 +94 @@
 }
 
-# ok at this point we have a request file add it to the database (unless we're in listMode)
-if ($listMode == 1 ) {
-    ###
-    ### In list mode just parse the file print the output and we're done
-    ###
-    my $command = "$pstampparse --mode list_uri --file $request_file";
-    $command .= " --dbname $dbname" if $dbname;
-    $command .= " --dbserver $dbserver" if $dbserver;
-    $command .= " --verbose" if $verbose;
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    if ($success) {
-        ### print "Matching Images:\n";
-        print @$stdout_buf;
-        exit 0;
-    } else {
-        # we send the output to STDOUT because that's where PHP finds it
-        print @$stdout_buf;
-        print @$stderr_buf;
-        exit 1;
-    }
-}
-
 # Queue the request
 my $req_id = 0;

tags/ipp-20100823/pstamp/src/ppstamp.c

@@ -22 +22 @@
 
     // define the active I/O files
-    if (!ppstampParseCamera(config)) {
+    if (!ppstampParseCamera(config, options)) {
         psErrorStackPrint(stderr, "Unable to parse camera.");
         ppstampCleanup(config, options);

tags/ipp-20100823/pstamp/src/ppstamp.h

@@ -18 +18 @@
 
 // Determine what type of camera, and initialise
-bool ppstampParseCamera(pmConfig *config);
+bool ppstampParseCamera(pmConfig *config, ppstampOptions *options);
 
 int ppstampMakeStamp(pmConfig *config, ppstampOptions *);

tags/ipp-20100823/pstamp/src/ppstampArguments.c

@@ -78 +78 @@
         psArgumentRemove(argnum, &argc, argv);
     }
+    if ((argnum = psArgumentGet(argc, argv, "-stage"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        options->stage = psStringCopy(argv[argnum]);
+        psArgumentRemove(argnum, &argc, argv);
+    }
 
     pmConfigFileSetsMD(config->arguments, &argc, argv, "ASTROM", "-astrom", "-astromlist");

tags/ipp-20100823/pstamp/src/ppstampMakeStamp.c

@@ -233 +233 @@
     int status = false;
 
-    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT");
+    pmFPAfile *output;
+    if (!options->stage || (strcmp(options->stage, "diff") != 0)) {
+        output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT");
+    } else {
+        output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT.DIFF");
+    }
     if (!output) {
         psError(PS_ERR_UNKNOWN, false, "Can't find output data\n");

tags/ipp-20100823/pstamp/src/ppstampOptions.h

@@ -10 +10 @@
     psString    chipName;
     psString    cellName;
+    psString    stage;
     //
     // Calculated Values

tags/ipp-20100823/pstamp/src/ppstampParseCamera.c

@@ -8 +8 @@
 
 // Set up the ppstamp output Image file
-bool setupOutput(pmConfig *config, pmFPAfile *input, bool doMask, bool doWeight)
+bool setupOutput(pmConfig *config, pmFPAfile *input, psString stage, bool doMask, bool doWeight)
 {
-    pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PPSTAMP.OUTPUT");
+    pmFPAfile *output;
+    
+    if (!stage || (strcmp(stage, "diff") != 0)) {
+        output = pmFPAfileDefineSkycell(config, NULL, "PPSTAMP.OUTPUT");
+    } else {
+        // need special filerule for diff stage image to allow for negative values
+        output = pmFPAfileDefineSkycell(config, NULL, "PPSTAMP.OUTPUT.DIFF");
+    }
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to setup output.");
+        return false;
+    }
+
     output->save = true;
 
@@ -29 +41 @@
 // something else that I'm missing?
 
-bool ppstampParseCamera(pmConfig *config)
+bool ppstampParseCamera(pmConfig *config, ppstampOptions *options)
 {
     bool status = false;
@@ -83 +95 @@
 
     // Set up the output target
-    if (!setupOutput(config, input, doMask, doWeight)) {
+    if (!setupOutput(config, input, options->stage, doMask, doWeight)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to setup output.");
         return false;