Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3565)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3566)
@@ -27,27 +27,11 @@
 {
 
-  //const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_02_10/";
-  //const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_26/";
   const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_27/";
-  //const TString inpath = "/mnt/Data/rootdata/Miscellaneous/2003_12_19/";
-  //  const TString inpath = "/mnt/Data/rootdata/Miscellaneous/2004_03_03/";
-  //    const TString inpath = "/home/rootdata/BlindPixel/";
-
-  //  const TString inpath = ".";
+
   MRunIter pruns;
   MRunIter cruns;
 
-  //  pruns.AddRun(20491,inpath);
-  //  pruns.AddRun(20123,inpath);
-
   pruns.AddRun(12386,inpath);
-  //    pruns.AddRun(14400,inpath);
-  //    cruns.AddRuns(14401,14409,inpath);
-  //    pruns.AddRuns(15487,15494,inpath);
- //  cruns.AddRuns(12525,12529,inpath);
   cruns.AddRun(12525,inpath);
-  //    cruns.AddRuns(15495,15508,inpath);
-  //  cruns.AddRun(20491,inpath);
-  //  cruns.AddRun(20129,inpath);
 
   gStyle->SetOptStat(1111);
@@ -77,10 +61,11 @@
   //
   /*
-    MJCalibration calloop;
-    calloop.SetInput(&cruns);
-    calloop.SetDisplay(display);
-    if (!calloop.Process(pedloop.GetPedestalCam()))
-        return;
-        //        #if 0
+  MJCalibration calloop;
+  calloop.SetInput(&cruns);
+  calloop.SetDisplay(display);
+  calloop.SetBadPixels(badcam);
+  if (!calloop.Process(pedloop.GetPedestalCam()))
+    return;
+    #if 0
   */
   // 
@@ -206,15 +191,16 @@
   // print the most important results of all pixels to a file
   //
+  /*
   MLog gauglog;
   gauglog.SetOutputFile(Form("%s%s",calcam.GetName(),".txt"),1);
   calcam.SetLogStream(&gauglog);
   badcam.Print();
-  //    calcam.Print();
   calcam.SetLogStream(&gLog);
+  */
   //
   // just one example how to get the plots of individual pixels
   //
   //    histblind.DrawClone("all");
-  //histcharge[5].DrawClone("all");
+  //    histcharge[5].DrawClone("all");
   //    histcharge(5).DrawClone("all");
   //    histtime[5].DrawClone("fourierevents");
@@ -226,5 +212,5 @@
   MHCamera disp4  (geomcam, "Cal;RSigma",         "Reduced Sigmas");
   MHCamera disp5  (geomcam, "Cal;RSigma/Charge",  "Reduced Sigma per Charge");
-  MHCamera disp6  (geomcam, "Cal;FFactorPh",      "Nr. of Photo-electrons (F-Factor Method)");
+  MHCamera disp6  (geomcam, "Cal;FFactorPhe",     "Nr. of Photo-electrons (F-Factor Method)");
   MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor to photons (F-Factor Method)");
   MHCamera disp8  (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
@@ -254,6 +240,6 @@
   MHCamera disp30 (geomcam, "time;Oscillating", "Oscillating Pixels");
   
-  MHCamera disp31 (geomcam, "Cal;AbsTimeMean", "Abs. Arrival Times");
-  MHCamera disp32 (geomcam, "Cal;AbsTimeRms",  "RMS of Arrival Times");
+  MHCamera disp31 (geomcam, "Cal;AbsTimeMean",  "Abs. Arrival Times");
+  MHCamera disp32 (geomcam, "Cal;AbsTimeRms",   "RMS of Arrival Times");
   
   // Fitted charge means and sigmas
@@ -294,13 +280,13 @@
   // Pixels with defects
   disp13.SetCamContent(calcam,26);
-  disp14.SetCamContent(calcam,27);
+  disp14.SetCamContent(badcam,7);
   disp15.SetCamContent(badcam,9);
   disp16.SetCamContent(badcam,16);
   disp17.SetCamContent(badcam,15);
-  disp18.SetCamContent(calcam,28);
-  disp19.SetCamContent(calcam,29);
+  disp18.SetCamContent(calcam,27);
+  disp19.SetCamContent(calcam,28);
   
   // Lo Gain calibration
-  disp20.SetCamContent(calcam,30);
+  disp20.SetCamContent(calcam,29);
   
   // Valid flags
@@ -310,8 +296,8 @@
   
   // Pedestals
-  disp24.SetCamContent(calcam,31);
-  disp24.SetCamError(  calcam,32);
-  disp25.SetCamContent(calcam,33);
-  disp25.SetCamError(  calcam,34);
+  disp24.SetCamContent(calcam,30);
+  disp24.SetCamError(  calcam,31);
+  disp25.SetCamContent(calcam,32);
+  disp25.SetCamError(  calcam,33);
   
   // Relative Times
@@ -325,7 +311,7 @@
   
   // Absolute Times
-  disp31.SetCamContent(calcam,35);
+  disp31.SetCamContent(calcam,34);
   disp31.SetCamError(  calcam,35);
-  disp32.SetCamContent(calcam,36);
+  disp32.SetCamContent(calcam,35);
   
   disp1.SetYTitle("Charge [FADC units]");
@@ -472,4 +458,5 @@
   CamDraw(c13,disp31,calcam,1,2,2);
   CamDraw(c13,disp32,calcam,2,2,2);
+#endif
 
 }
@@ -516,5 +503,4 @@
   if (fit != 0)
     {
-
       c.cd(i+2*j);
       gPad->SetBorderMode(0);
@@ -541,4 +527,5 @@
           hprof[k]->Fit("pol1","Q","",min,max);
           hprof[k]->GetFunction("pol1")->SetLineColor(kRed+k);
+          hprof[k]->GetFunction("pol1")->SetLineWidth(1);
         }