--- calo/flight/CaloFranzini/src/CaloCreateMatrix.cpp	2007/12/13 17:08:10	1.1
+++ calo/flight/CaloFranzini/src/CaloCreateMatrix.cpp	2007/12/18 09:55:06	1.2
@@ -20,6 +20,7 @@
 // global variables
 //===================================
 Bool_t    DEBUG;
+Bool_t    MATRIX;
 TString   DIR;
 TString   LIST;
 TString   I_OPTIONS;
@@ -64,21 +65,15 @@
     
   if( !Select(event) )return false;
 
-  FindAverage(event,iev);
-
+  if ( MATRIX ){
+    FindMatrix(event,iev);    
+  } else {
+    FindAverage(event,iev);
+  };
   return true;
 
 }
 
-bool Process2(int iev){
-    
-  if( !Select(event) )return false;
-
-  FindMatrix(event,iev);
-
-  return true;
-
-}
 //==========================================
 //000000000000000000000000000000000000000000
 //==========================================
@@ -136,18 +131,7 @@
 
   };
 
-  CalculateAverage();
-
-  for(ULong64_t iev=nmin; iev<nmin+nmax; iev++){
-    //
-    event->Clear();
-    if( event->GetEntry(iev) ){
-      Process2(iev);
-    }else{
-      cout << "Chain entry "<<iev<<" -- ERROR --"<<endl;
-    };
-
-  };
+  if ( !MATRIX ) CalculateAverage();
 
   event->Clear();
   //  --------------
@@ -200,6 +184,7 @@
     // Read input parameters
     // -----------------------  
     DEBUG   = false;
+    MATRIX  = false;
     DIR     = gSystem->WorkingDirectory();
     LIST    = "";
     OUTFILE = "";
@@ -272,6 +257,11 @@
 	DEBUG = true;
 	continue;	
       }
+      //
+      else if (!strcmp(argv[i], "-matrix")){
+      MATRIX = true;
+	continue;	
+      }
       // -----------------------------------------------------//
       else{
 	cout << "Unidentified input parameter. Ignored."<< endl;