Changeset 13460

Timestamp:

May 21, 2007, 6:22:29 PM (19 years ago)

Author:

Paul Price

Message:

Making things work.

Location:

trunk/ippScripts/scripts

Files:

• camera_exp.pl (modified) (2 diffs)
• ipp_simulation_data.pl (modified) (3 diffs)

trunk/ippScripts/scripts/camera_exp.pl

@@ -153 +153 @@
 my $jpeg1 = $ipprc->filename("PPIMAGE.JPEG1", $outputRoot); # Binned JPEG #1
 my $jpeg2 = $ipprc->filename("PPIMAGE.JPEG2", $outputRoot); # Binned JPEG #2
-my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT", $outputRoot); # MEF psastro output
+my $fpaObjects = $outputRoot . '.smp'; # MEF psastro output
 
 unless ($no_op) {
@@ -160 +160 @@
     # XXX note that this is wrong if imfiles are cells
     if (scalar @$files > 1) {
-        my $command = "$psastro -list $list3Name $outputRoot +mosastro -chipastro";
+        my $command = "$psastro -list $list3Name $outputRoot +mosastro -chipastro " . 
+            "-F PSASTRO.OUTPUT PSASTRO.OUTPUT.MEF";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => 1);

trunk/ippScripts/scripts/ipp_simulation_data.pl

@@ -124 +124 @@
     ( $basename, $counter ) = filename( $name, $counter );
     my $filename = caturi( $path, $basename );
-    run( command => "$ppSim -camera $camera -type BIAS $filename",
-         verbose => 1 ) or die "Unable to run ppSim";
-    run( command => "$inject --camera $camera --telescope $telescope --path $path --workdir $workdir " .
-         "--dbname $dbname $basename",
-         verbose => 1 ) or die "Unable to inject file.";
+#    run( command => "$ppSim -camera $camera -type BIAS $filename",
+#        verbose => 1 ) or die "Unable to run ppSim";
+#    run( command => "$inject --camera $camera --telescope $telescope --path $path --workdir $workdir " .
+#        "--dbname $dbname $basename",
+#        verbose => 1 ) or die "Unable to inject file.";
 }
 
@@ -136 +136 @@
     ( $basename, $counter ) = filename( $name, $counter );
     my $filename = caturi( $path, $basename );
-    run ( command => "$ppSim -camera $camera -type DARK -exptime $exptime $filename",
-          verbose => 1 ) or die "Unable to run ppSim";
-    run( command => "$inject --camera $camera --telescope $telescope --path $path --workdir $workdir " .
-         "--dbname $dbname $basename",
-         verbose => 1 ) or die "Unable to inject file.";
+#    run ( command => "$ppSim -camera $camera -type DARK -exptime $exptime $filename",
+#         verbose => 1 ) or die "Unable to run ppSim";
+#    run( command => "$inject --camera $camera --telescope $telescope --path $path --workdir $workdir " .
+#        "--dbname $dbname $basename",
+#        verbose => 1 ) or die "Unable to inject file.";
 }
 
@@ -150 +150 @@
         ( $basename, $counter ) = filename( $name, $counter );
         my $filename = caturi( $path, $basename );
-        run( command => "$ppSim -camera $camera -type FLAT -filter $filter -exptime $exptime $filename",
-             verbose => 1 ) or die "Unable to run ppSim";
-        run( command => "$inject --camera $camera --telescope $telescope --path $path --workdir $workdir " .
-             "--dbname $dbname $basename",
-             verbose => 1 ) or die "Unable to inject file.";
+#       run( command => "$ppSim -camera $camera -type FLAT -filter $filter -exptime $exptime $filename",
+#            verbose => 1 ) or die "Unable to run ppSim";
+#        run( command => "$inject --camera $camera --telescope $telescope --path $path --workdir $workdir " .
+#            "--dbname $dbname $basename",
+#            verbose => 1 ) or die "Unable to inject file.";
     }
 }