--- calo/flight/CaloFranzini/src/CaloCreateMatrix.cpp	2007/12/18 09:55:06	1.2
+++ calo/flight/CaloFranzini/src/CaloCreateMatrix.cpp	2008/01/03 10:02:27	1.3
@@ -19,8 +19,12 @@
 //===================================
 // global variables
 //===================================
+Bool_t    CRIG;
+Bool_t    SRIG;
+Bool_t    SIMU;
 Bool_t    DEBUG;
 Bool_t    MATRIX;
+Bool_t    FULL;
 TString   DIR;
 TString   LIST;
 TString   I_OPTIONS;
@@ -100,7 +104,8 @@
   //  read input file/list
   //  --------------------
   event = new PamLevel2(ddir,list,ioptions);
-
+  event->SetSortingMethod("CALS1S2");
+  if ( SIMU ) event->SetSortingMethod("+GP");
   //  tree->SetCacheSize(0);
 
   //  ---------------
@@ -183,8 +188,12 @@
     // -----------------------
     // Read input parameters
     // -----------------------  
+    SIMU = false;
+    CRIG = false;
+    SRIG = false;
     DEBUG   = false;
     MATRIX  = false;
+    FULL = false;
     DIR     = gSystem->WorkingDirectory();
     LIST    = "";
     OUTFILE = "";
@@ -259,7 +268,30 @@
       }
       //
       else if (!strcmp(argv[i], "-matrix")){
-      MATRIX = true;
+	MATRIX = true;
+	continue;	
+      }
+      // -----------------------------------------------------//
+      //
+      else if (!strcmp(argv[i], "-simu")){
+	SIMU = true;
+	continue;	
+      }
+      // -----------------------------------------------------//
+      //
+      else if (!strcmp(argv[i], "-calorig")){
+	CRIG = true;
+	continue;	
+      }
+      // -----------------------------------------------------//
+      //
+      else if (!strcmp(argv[i], "-simurig")){
+	SRIG = true;
+	continue;	
+      }
+      // -----------------------------------------------------//
+      else if (!strcmp(argv[i], "-full")){
+	FULL = true;
 	continue;	
       }
       // -----------------------------------------------------//