Index: /trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C	(revision 3483)
+++ /trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C	(revision 3484)
@@ -1,3 +1,2 @@
-
 
 //#include "MagicEgyEst.C"
@@ -174,5 +173,7 @@
       //const char *offfile = "20040126_OffCrab_"; 
       //const char *offfile  = "*.OFF";
-      const char *offfile  = "12*.OFF";
+      //const char *offfile  = "12776.OFF";
+      //const char *offfile  = "12*.OFF";
+      const char *offfile  = "*.OFF";
 
       //const char *onfile  = "~magican/ct1test/wittek/mkn421_on.preproc"; 
@@ -181,6 +182,7 @@
       //const char *onfile  = "MCerPhot_output";
       //const char *onfile  = "*.ON";
-      const char *onfile  = "12*.ON";
-      //const char *onfile  = "1238*.ON";
+      //const char *onfile  = "12162*.ON";
+      //const char *onfile  = "12*.ON";
+      const char *onfile  = "*.ON";
 
      const char *mcfile  = "/data/MAGIC/mc_eth/magLQE_3/gh/0/0/G_M0_00_0_550*.root";
@@ -194,10 +196,12 @@
       //TString inPath = "~wittek/datacrab_feb04/";
       //TString inPath = "~wittek/datacrab_26feb04/";
-     TString inPath = "/.magic/magicserv01/scratch/calibrated/";
      //TString inPath = "/.magic/magicserv01/scratch/David/CalibratedRuns/";
+     //TString inPath = "/.magic/magicserv01/scratch/calibrated/";
+     TString inPath = "/.magic/magicserv01/scratch/calibrated26/";
 
       // path for output from Mars
       //TString outPath = "~wittek/datacrab_feb04/";
-      TString outPath = "~wittek/datacrab_26feb04/";
+     //TString outPath = "~wittek/datacrab_01march04/";
+      TString outPath = "~wittek/datacrab_04mar04/";
 
       //-----------------------------------------------
@@ -252,5 +256,5 @@
                                   // onto the file parSCfile
     Bool_t RTest       = kFALSE;  // test the supercuts using the test matrix
-    Bool_t WSC         = kTRUE;  // update input root file ?
+    Bool_t WSC         = kFALSE;  // update input root file ?
 
 
@@ -348,6 +352,6 @@
     //--------------------------------------------------
     // type of data to be padded 
-    TString typeInput = "ON";
-    //TString typeInput = "OFF";
+    //TString typeInput = "ON";
+    TString typeInput = "OFF";
     //TString typeInput = "MC";
     gLog << "typeInput = " << typeInput << endl;
@@ -672,4 +676,6 @@
     MTaskList tliston;
     MParList pliston;
+
+    MObservatory observ;
 
     char *sourceName = "MSrcPosCam";
@@ -726,5 +732,5 @@
     //blind.SetUseBlindPixels();
     blind.SetUseInterpolation();
-    //blind.SetCheckPedestalRMS();
+    blind.SetCheckPedestalRMS();
     blind.SetName("BlindAfterPadding");
 
@@ -741,5 +747,7 @@
     fillsigtheta.SetName("HSigmaTheta");
 
-    MImgCleanStd    clean; 
+    MImgCleanStd    clean(3.0, 2.5);
+    clean.SetMethod(MImgCleanStd::kDemocratic);
+    clean.SetCleanRings(3); 
 
 
@@ -777,5 +785,5 @@
     selstandard.SetHillasName(fHilName);
     selstandard.SetImgParName(fImgParName);
-    selstandard.SetCuts(200, 4, 600, 0.2, 1.3, 0.0, 0.0);
+    selstandard.SetCuts(300, 6, 3000, 0.0, 1.1, 0.001, 0.001);
     MContinue contstandard(&selstandard);
     contstandard.SetName("SelStandard");
@@ -801,4 +809,5 @@
     
     pliston.AddToList(&tliston);
+    pliston.AddToList(&observ);
     InitBinnings(&pliston);
 
@@ -1832,5 +1841,5 @@
 
     TString parSCfile = outPath;
-    parSCfile += "parSC_240204a";
+    parSCfile += "parSC_050304a";
 
     gLog << "parSCfile = " << parSCfile << endl;
@@ -1839,6 +1848,6 @@
     // file to be updated (either ON or MC)
 
-    //TString typeInput = "ON";
-    TString typeInput = "OFF";
+    TString typeInput = "ON";
+    //TString typeInput = "OFF";
     //TString typeInput = "MC";
     gLog << "typeInput = " << typeInput << endl;