--- quicklook/calo/FQLOOK/src/FCaloCHKCALIB.cc	2006/07/10 13:55:02	1.3
+++ quicklook/calo/FQLOOK/src/FCaloCHKCALIB.cc	2006/08/04 15:24:02	1.4
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <stdio.h>
 //
-extern void FCaloCHKCALIB(TString,  Long64_t, TString, int, TString);
+extern void FCaloCHKCALIB(TString,  Long64_t, TString, int, TString, Bool_t, Bool_t);
 extern void info();
 using namespace std;
 //
@@ -25,9 +25,11 @@
   printf("\n OPTIONS: \n");  
   printf("\n -v                  be verbose \n");  
   printf(  " -entry entry        calibration entry to analyze [default = 0, all] \n");
+  printf(  " -interactive        shows figures on the screen [default = non-interactive] \n");
+  printf(  " -wait               wait for canvas to be closed before going on [default = don't wait] \n");
   printf(  " -matra              draw the strip rms in a box plot [default: do not draw] \n");
   printf(  " -oudDir output_dir  path of the output directory [default = ./] (with or without final '/') \n");
-  printf(  " -format format      format for output file (without . )[default = ps] \n");
+  printf(  " -format format      format for output file (without . )[default = png] \n");
   printf("\nExamples: ");
   printf("\n\nFCaloCHKCALIB /home/pamela/filesfromyoda/dw_050301_00100.root \n");
   printf("\nFCaloCHKCALIB -v -name /home/pamela/filesfromyoda/dw_050301_00100.root \n");
@@ -37,13 +39,14 @@
 int main(int numinp, char *inps[]){
   TString name;
   TString outdir = "";
-  TString format = "ps";
+  TString format = "png";
   int matra = 0;
   Long64_t calibno = 0;
   char *pEnd;
   int nul = 0;
   bool beverbose = false;
-
+  Bool_t iactive = false;
+  Bool_t w4i = false;
 
   if ( numinp > 1 ){
     name = (TString)inps[1];
@@ -89,6 +92,12 @@
       if ( !strcmp(inps[i],"-matra") ) {
 	matra = 1;
       };     
+      if ( !strcmp(inps[i],"-interactive") ) {
+	iactive = true;
+      };     
+      if ( !strcmp(inps[i],"-wait") ) {
+	w4i = true;
+      };     
       if ( !strcmp(inps[i],"-v") || !strcmp(inps[i],"--verbose") ) beverbose = true;
     };
   } else {
@@ -109,7 +118,7 @@
   };
   printf("\n Welcome to FCaloCHKCALIB! \n");
   //
-  FCaloCHKCALIB(name,calibno,outdir,matra,format);
+  FCaloCHKCALIB(name,calibno,outdir,matra,format,iactive,w4i);
   //
   if ( !beverbose ) close(nul);
   return(0);