--- quicklook/calo/FQLOOK/src/FCaloCHKCALIB.cc	2006/03/13 09:01:26	1.2
+++ quicklook/calo/FQLOOK/src/FCaloCHKCALIB.cc	2006/07/10 13:55:02	1.3
@@ -19,14 +19,19 @@
 using namespace std;
 //
 void usage(){
-  printf("\nUsage:\n\n FCaloCHKCALIB [-v] file calib_number output_directory matra figure_format \n");
-  printf("\n -v               be verbose \n");  
-  printf(  " file             must be in the form: /path/to/filesfromyoda/dw_000000_00000/  \n");
-  printf(  " calib_number     is an integer (progressive calibration number), 0 = all \n");
-  printf(  " output_dir       directory where to store figures \n");
-  printf(  " matra            integer, 1 to print the strip rms in a box plot 0 to skip it\n");
-  printf(  " figure format    any format recognized by ROOT (eps,gif,...)\n");
-  printf("\nExample: \n\nFCaloCHKCALIB /home/pamela/filesfromyoda/dw_050301_00100/ 0 /tmp/ 0 ps \n\n");
+  printf("\nUsage:\n\n FCaloCHKCALIB [-name] file [OPTIONS] \n");
+  printf("\n file             must be in the form: /path/to/filesfromyoda/ZZZ_XXX_YYYYY_cln2.root  \n");
+  printf(  "                  if in the first position \"-name\" can be omitted. \n");  
+  printf("\n OPTIONS: \n");  
+  printf("\n -v                  be verbose \n");  
+  printf(  " -entry entry        calibration entry to analyze [default = 0, all] \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("\nExamples: ");
+  printf("\n\nFCaloCHKCALIB /home/pamela/filesfromyoda/dw_050301_00100.root \n");
+  printf("\nFCaloCHKCALIB -v -name /home/pamela/filesfromyoda/dw_050301_00100.root \n");
+  printf("\nFCaloCHKCALIB /home/pamela/filesfromyoda/DW_050523_01600.root -v -entry 2 -matra -outDir /tmp/ -format gif \n\n");
 }
 //
 int main(int numinp, char *inps[]){
@@ -38,38 +43,60 @@
   char *pEnd;
   int nul = 0;
   bool beverbose = false;
-  if ( numinp == 1 ){
-    usage();
-    return(0);    
-  };
+
+
   if ( numinp > 1 ){
-    if ( !strcmp(inps[1],"--version") ){
-      info();
-      return(0);
-    };
-    if ( !strcmp(inps[1],"-h") || !strcmp(inps[1],"--help") || numinp>7 ){
-      usage();
-      return(0);
-    } else {
-      if ( !strcmp(inps[1],"-v") || !strcmp(inps[1],"--verbose") ){
-	beverbose = true;
-	if ( numinp == 2 ) { 
-	  info();
-	  return(0);    
+    name = (TString)inps[1];
+    for ( int i = 0; i < numinp; i++ ){
+      
+      if ( !strcmp(inps[i],"--version") ){
+	info();
+	return(0);
+      };
+      if ( !strcmp(inps[i],"-h") || !strcmp(inps[i],"--help") ){
+	usage();
+	return(0);
+      };
+      if ( !strcmp(inps[i],"-name") ) {
+	if ( numinp-1 < i+1 ){
+	  usage();
+	  exit(-3);
+	};
+	name = (TString)inps[i+1];
+      };
+      if ( !strcmp(inps[i],"-outDir") ) {
+	if ( numinp-1 < i+1 ){
+	  usage();
+	  exit(-3);
 	};
-	if ( numinp >= 3 ) name = (TString)inps[2];
-	if ( numinp >= 4 ) calibno = strtoull(inps[3],&pEnd,0);
-	if ( numinp >= 5 ) outdir = (TString)inps[4];
-	if ( numinp >= 6 ) matra = atoi(inps[5]);
-	if ( numinp == 7 ) format = (TString)inps[6];
-      } else {
-	if ( numinp >= 2 ) name = (TString)inps[1];
-	if ( numinp >= 3 ) calibno = strtoull(inps[2],&pEnd,0);
-	if ( numinp >= 4 ) outdir = (TString)inps[3];
-	if ( numinp >= 5 ) matra = atoi(inps[4]);
-	if ( numinp == 6 ) format = (TString)inps[5];
+	outdir = (TString)inps[i+1];
       };
+      if ( !strcmp(inps[i],"-format") ) {
+	if ( numinp-1 < i+1 ){
+	  usage();
+	  exit(-3);
+	};
+	format = (TString)inps[i+1];
+      };
+
+      if ( !strcmp(inps[i],"-entry") ) {
+	if ( numinp-1 < i+1 ){
+	  usage();
+	  exit(-3);
+	};
+	calibno = strtoull(inps[i+1],&pEnd,0);
+      };
+      if ( !strcmp(inps[i],"-matra") ) {
+	matra = 1;
+      };     
+      if ( !strcmp(inps[i],"-v") || !strcmp(inps[i],"--verbose") ) beverbose = true;
     };
+  } else {
+    //
+    // no input parameters exit with error, we need at least the run id.
+    //
+    usage();
+    return(0);    
   };
   //
   if ( !beverbose ){