Index: trunk/ippScripts/scripts/ipp_simulation_data.pl
===================================================================
--- trunk/ippScripts/scripts/ipp_simulation_data.pl	(revision 13859)
+++ trunk/ippScripts/scripts/ipp_simulation_data.pl	(revision 13861)
@@ -31,4 +31,5 @@
     $path,			# Path to data
     $workdir,			# Working directory for data
+    $no_cal,			# Don't produce calibration files
     $no_update			# Don't update the database
     );
@@ -41,4 +42,5 @@
 	   'path=s'        => \$path,
 	   'workdir=s'     => \$workdir,
+	   'no-cal'        => \$no_cal,
 	   'no-update'     => \$no_update,
 	   ) or pod2usage( 2 );
@@ -97,5 +99,5 @@
 			    zp => 25.15,
 			    sky => 20.86,
-			    dither => 20,
+			    dither => 40,
 			},
 			{
@@ -108,5 +110,5 @@
 			    zp => 25.00,
 			    sky => 20.15,
-			    dither => 20,
+			    dither => 40,
 			},
 			];
@@ -124,9 +126,13 @@
     ( $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.";
+    unless ($no_cal) {
+	run( command => "$ppSim -camera $camera -type BIAS $filename",
+	     verbose => 1 ) or die "Unable to run ppSim";
+	unless ($no_update) {
+	    run( command => "$inject --camera $camera --telescope $telescope --path $path " .
+		 "--workdir $workdir --dbname $dbname $basename",
+		 verbose => 1 ) or die "Unable to inject file.";
+	}
+    }
 }
 
@@ -136,9 +142,13 @@
     ( $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.";
+    unless ($no_cal) {
+	run ( command => "$ppSim -camera $camera -type DARK -exptime $exptime $filename",
+	      verbose => 1 ) or die "Unable to run ppSim";
+	unless ($no_update) {
+	    run( command => "$inject --camera $camera --telescope $telescope --path $path " .
+		 "--workdir $workdir --dbname $dbname $basename",
+		 verbose => 1 ) or die "Unable to inject file.";
+	}
+    }
 }
 
@@ -150,9 +160,13 @@
 	( $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.";
+	unless ($no_cal) {
+	    run( command => "$ppSim -camera $camera -type FLAT -filter $filter -exptime $exptime $filename",
+		 verbose => 1 ) or die "Unable to run ppSim";
+	    unless ($no_update) {
+		run( command => "$inject --camera $camera --telescope $telescope --path $path " .
+		     "--workdir $workdir --dbname $dbname $basename",
+		     verbose => 1 ) or die "Unable to inject file.";
+	    }
+	}
     }
 }
@@ -181,7 +195,9 @@
 	     "-skyrate $sky -ra $ra -dec $dec -pa $pa -scale $scale -zp $zp -seeing $seeing $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.";
+	unless ($no_update) {
+	    run( command => "$inject --camera $camera --telescope $telescope --path $path " .
+		 "--workdir $workdir --dbname $dbname $basename",
+		 verbose => 1 ) or die "Unable to inject file.";
+	}
     }
 }