Index: trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C
===================================================================
--- trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C	(revision 3204)
+++ trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C	(revision 3209)
@@ -172,5 +172,5 @@
       //-----------------------------------------------
       //const char *offfile = "~magican/ct1test/wittek/offdata.preproc"; 
-      const char *offfile = "/data/MAGIC/rootdata/2003_11_29/20031128_032*_D_OffCrab1_E.root"; 
+      const char *offfile = "20040126_OffCrab_"; 
 
       //const char *onfile  = "~magican/ct1test/wittek/mkn421_on.preproc"; 
@@ -203,5 +203,5 @@
     //  - write root file for ON (or OFF or MC) data (ON1.root, ...);
 
-    Bool_t JobA    = kFALSE;  
+    Bool_t JobA    = kTRUE;  
     Bool_t GPad    = kFALSE;    // generate padding histograms?
     Bool_t WPad    = kFALSE;   // write out padding histograms ?
@@ -233,5 +233,5 @@
     //  - update the input files with the hadroness (==>ON3.root or MC3.root)
 
-    Bool_t JobB_SC_UP  = kTRUE;
+    Bool_t JobB_SC_UP  = kFALSE;
     Bool_t CMatrix     = kFALSE;  // create training and test matrices 
     Bool_t RMatrix     = kTRUE;  // read training and test matrices from file
@@ -239,5 +239,5 @@
                                   // and write supercuts parameter values 
                                   // onto the file parSCfile
-    Bool_t RTest       = kTRUE;  // test the supercuts using the test matrix
+    Bool_t RTest       = kFALSE;  // test the supercuts using the test matrix
     Bool_t WSC         = kFALSE;  // update input root file ?
 
@@ -313,10 +313,20 @@
     // for generating the histograms to be used in the padding 
 
+
     TString fileON  = inPath;
     fileON += onfile;
     fileON += "CalibratedEvts";
     fileON += ".root";
-    TString fileOFF = offfile;
+
+    TString fileOFF = inPath;
+    fileOFF += offfile;
+    fileOFF += "CalibratedEvts";
+    fileOFF += ".root";
+
     TString fileMC  = mcfile;
+    fileMC += mcfile;
+    fileMC += "CalibratedEvts";
+    fileMC += ".root";
+
     gLog << "fileON, fileOFF, fileMC = " << fileON << ",  " 
          << fileOFF << ",  " << fileMC   << endl;
@@ -329,6 +339,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;
@@ -345,6 +355,13 @@
 
     // name of output root file
+    if (typeInput == "ON")
+      TString file(onfile);
+    else if (typeInput == "OFF")
+      TString file(offfile);
+    else if (typeInput == "MC")
+      TString file(mcfile);
+
     TString outNameImage = outPath;
-    outNameImage += onfile;
+    outNameImage += file;
     outNameImage += "Hillas";
     outNameImage += typeInput;
@@ -1765,6 +1782,6 @@
 
     TString parSCinit = outPath;
-    parSCinit += "parSC_060204a";
-    //parSCinit = "";
+    //parSCinit += "parSC_060204";
+    parSCinit = "";
 
     if (parSCinit != "")
@@ -1785,5 +1802,5 @@
 
     TString parSCfile = outPath;
-    parSCfile += "parSC_060204b";
+    parSCfile += "parSC_130204a";
 
     gLog << "parSCfile = " << parSCfile << endl;
@@ -1946,4 +1963,5 @@
     if (parSCinit == "")
     {
+      /*
       Double_t vparams[104] = {
       // LengthUp
@@ -2027,6 +2045,90 @@
 	0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
         0.0,       0.0                                                 };
-
-
+      */
+
+
+      Double_t vparams[104] = {
+      // LengthUp
+	0.315585,  0.001455, 0.203198, 0.005532, -0.001670, -0.020362,
+	0.007388, -0.013463,
+      // LengthLo
+        0.151530,  0.028323, 0.510707, 0.053089,  0.013708,  2.357993,
+	0.000080, -0.007157,
+      // WidthUp
+        0.145412, -0.001771, 0.054462, 0.022280, -0.009893,  0.056353,
+        0.020711, -0.016703,
+      // WidthLo
+        0.089187, -0.006430, 0.074442, 0.003738, -0.004256, -0.014101,
+        0.006126, -0.002849,
+      // DistUp
+        1.787943,  0.0,      2.942310, 0.199815,  0.0,       0.249909,
+        0.189697,  0.0,
+      // DistLo
+        0.589406,  0.0,     -0.083964,-0.007975,  0.0,       0.045374,
+       -0.001750,  0.0,
+      // AsymUp
+        1.e10,     0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // AsymLo
+       -1.e10,     0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // ConcUp
+        1.e10,     0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // ConcLo
+       -1.e10,     0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // Leakage1Up
+        1.e10,     0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // Leakage1Lo
+       -1.e10,     0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // AlphaUp
+	13.12344,  0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0                                                 };
+
+      Double_t vsteps[104] = {
+      // LengthUp
+        0.03,      0.0002,   0.02,     0.0006,    0.0002,    0.002,
+        0.0008,    0.002,
+      // LengthLo
+        0.02,      0.003,    0.05,     0.006,     0.002,     0.3,
+        0.0001,    0.0008,
+      // WidthUp
+        0.02,      0.0002,   0.006,    0.003,     0.002,     0.006,
+        0.002,     0.002,
+      // WidthLo
+        0.009,     0.0007,   0.008,    0.0004,    0.0005,    0.002,
+        0.0007,    0.003,
+      // DistUp
+        0.2,       0.0,      0.3,      0.02,      0.0,       0.03,
+        0.02,      0.0
+      // DistLo
+        0.06,      0.0,      0.009,    0.0008,    0.0,       0.005,
+        0.0002,    0.0
+      // AsymUp  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // AsymLo  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // ConcUp  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // ConcLo  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // Leakage1Up  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // Leakage1Lo  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0,
+      // AlphaUp  
+        0.0,       0.0,      0.0,      0.0,       0.0,       0.0,
+        0.0,       0.0                                                 };
+
+ 
       params.Set(104, vparams);
       steps.Set (104, vsteps );
