Changeset 29384
- Timestamp:
- Oct 12, 2010, 3:00:38 PM (16 years ago)
- Location:
- tags/ipp-20100823
- Files:
-
- 14 edited
-
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)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20100823/ippconfig/recipes/filerules-mef.mdc
- Property svn:mergeinfo set to
r28541 r29384 295 295 296 296 PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE 297 PPSTAMP.OUTPUT.DIFF OUTPUT {OUTPUT}.fits IMAGE COMP_SUB FPA TRUE NONE 297 298 PPSTAMP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE 298 299 PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT FPA TRUE NONE -
tags/ipp-20100823/ippconfig/recipes/filerules-simple.mdc
- Property svn:mergeinfo set to
r28541 r29384 261 261 262 262 PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE 263 PPSTAMP.OUTPUT.DIFF OUTPUT {OUTPUT}.fits IMAGE COMP_SUB FPA TRUE NONE 263 264 PPSTAMP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE 264 265 PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT FPA TRUE NONE -
tags/ipp-20100823/ippconfig/recipes/filerules-split.mdc
- Property svn:mergeinfo set to
r28961 r29384 280 280 281 281 PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE 282 PPSTAMP.OUTPUT.DIFF OUTPUT {OUTPUT}.fits IMAGE COMP_SUB FPA TRUE NONE 282 283 PPSTAMP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE 283 284 PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT FPA TRUE NONE -
tags/ipp-20100823/pstamp/scripts
- Property svn:mergeinfo set to
-
tags/ipp-20100823/pstamp/scripts/pstamp_checkdependent.pl
- Property svn:mergeinfo deleted
-
tags/ipp-20100823/pstamp/scripts/pstamp_job_run.pl
r28927 r29384 118 118 $command .= " -dbname $dbname" if $dbname; 119 119 $command .= " -dbserver $dbserver" if $dbserver; 120 $command .= " -stage $params->{stage}" if $params->{stage}; 120 121 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 121 122 run(command => $command, verbose => $verbose); -
tags/ipp-20100823/pstamp/scripts/pstamp_webrequest.pl
r29333 r29384 26 26 my $dbname; 27 27 my $dbserver; 28 my $project;29 my $job_type;30 28 31 29 GetOptions( 32 'job_type=s' => \$job_type,33 30 'dbname=s' => \$dbname, 34 31 'dbserver=s' => \$dbserver, 35 # 'project=s' => \$project,36 32 'verbose' => \$verbose, 37 33 ); … … 42 38 print "\n\n"; 43 39 print "Starting script $0 on $host\n\n"; 44 }45 46 my $listMode;47 if ($job_type and ($job_type eq 'list_uri')) {48 $listMode=1;49 } else {50 $listMode=0;51 40 } 52 41 … … 105 94 } 106 95 107 # ok at this point we have a request file add it to the database (unless we're in listMode)108 if ($listMode == 1 ) {109 ###110 ### In list mode just parse the file print the output and we're done111 ###112 my $command = "$pstampparse --mode list_uri --file $request_file";113 $command .= " --dbname $dbname" if $dbname;114 $command .= " --dbserver $dbserver" if $dbserver;115 $command .= " --verbose" if $verbose;116 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =117 run(command => $command, verbose => $verbose);118 119 if ($success) {120 ### print "Matching Images:\n";121 print @$stdout_buf;122 exit 0;123 } else {124 # we send the output to STDOUT because that's where PHP finds it125 print @$stdout_buf;126 print @$stderr_buf;127 exit 1;128 }129 }130 131 96 # Queue the request 132 97 my $req_id = 0; -
tags/ipp-20100823/pstamp/src
- Property svn:mergeinfo set to
-
tags/ipp-20100823/pstamp/src/ppstamp.c
r25197 r29384 22 22 23 23 // define the active I/O files 24 if (!ppstampParseCamera(config )) {24 if (!ppstampParseCamera(config, options)) { 25 25 psErrorStackPrint(stderr, "Unable to parse camera."); 26 26 ppstampCleanup(config, options); -
tags/ipp-20100823/pstamp/src/ppstamp.h
r25709 r29384 18 18 19 19 // Determine what type of camera, and initialise 20 bool ppstampParseCamera(pmConfig *config );20 bool ppstampParseCamera(pmConfig *config, ppstampOptions *options); 21 21 22 22 int ppstampMakeStamp(pmConfig *config, ppstampOptions *); -
tags/ipp-20100823/pstamp/src/ppstampArguments.c
r24966 r29384 78 78 psArgumentRemove(argnum, &argc, argv); 79 79 } 80 if ((argnum = psArgumentGet(argc, argv, "-stage"))) { 81 psArgumentRemove(argnum, &argc, argv); 82 options->stage = psStringCopy(argv[argnum]); 83 psArgumentRemove(argnum, &argc, argv); 84 } 80 85 81 86 pmConfigFileSetsMD(config->arguments, &argc, argv, "ASTROM", "-astrom", "-astromlist"); -
tags/ipp-20100823/pstamp/src/ppstampMakeStamp.c
r28882 r29384 233 233 int status = false; 234 234 235 pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT"); 235 pmFPAfile *output; 236 if (!options->stage || (strcmp(options->stage, "diff") != 0)) { 237 output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT"); 238 } else { 239 output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT.DIFF"); 240 } 236 241 if (!output) { 237 242 psError(PS_ERR_UNKNOWN, false, "Can't find output data\n"); -
tags/ipp-20100823/pstamp/src/ppstampOptions.h
r16132 r29384 10 10 psString chipName; 11 11 psString cellName; 12 psString stage; 12 13 // 13 14 // Calculated Values -
tags/ipp-20100823/pstamp/src/ppstampParseCamera.c
r24966 r29384 8 8 9 9 // Set up the ppstamp output Image file 10 bool setupOutput(pmConfig *config, pmFPAfile *input, bool doMask, bool doWeight)10 bool setupOutput(pmConfig *config, pmFPAfile *input, psString stage, bool doMask, bool doWeight) 11 11 { 12 pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PPSTAMP.OUTPUT"); 12 pmFPAfile *output; 13 14 if (!stage || (strcmp(stage, "diff") != 0)) { 15 output = pmFPAfileDefineSkycell(config, NULL, "PPSTAMP.OUTPUT"); 16 } else { 17 // need special filerule for diff stage image to allow for negative values 18 output = pmFPAfileDefineSkycell(config, NULL, "PPSTAMP.OUTPUT.DIFF"); 19 } 20 if (!output) { 21 psError(PS_ERR_UNKNOWN, false, "Unable to setup output."); 22 return false; 23 } 24 13 25 output->save = true; 14 26 … … 29 41 // something else that I'm missing? 30 42 31 bool ppstampParseCamera(pmConfig *config )43 bool ppstampParseCamera(pmConfig *config, ppstampOptions *options) 32 44 { 33 45 bool status = false; … … 83 95 84 96 // Set up the output target 85 if (!setupOutput(config, input, doMask, doWeight)) {97 if (!setupOutput(config, input, options->stage, doMask, doWeight)) { 86 98 psError(PS_ERR_UNKNOWN, false, "Unable to setup output."); 87 99 return false;
Note:
See TracChangeset
for help on using the changeset viewer.
