Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3359)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3360)
@@ -7,4 +7,6 @@
    
    * mjobs/MJPedestal.cc
+   * mjobs/MJCalibration.cc
+   * macros/calibration.C
     
      - put in call to MHCamera::Projection the name of teh calling 
Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3359)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3360)
@@ -28,5 +28,7 @@
 {
 
-    const char *inpath = "/remote/home/pc2/operator/Crab20040214/";
+//    const char *inpath = "/remote/home/pc2/operator/NewCalBoxTest/";
+//    const char *inpath = "/remote/home/pc2/operator/Crab20040214/";
+    const char *inpath = "./";
     //const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_02_10/";
     //const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_26/";
@@ -36,6 +38,11 @@
     MRunIter cruns;
 
-    pruns.AddRuns(15487,15494,inpath);
-    cruns.AddRuns(15495,15508,inpath);
+    pruns.AddRun(14400,inpath);
+    cruns.AddRuns(14401,14409,inpath);
+//    pruns.AddRuns(15487,15494,inpath);
+//    cruns.AddRuns(15495,15508,inpath);
+//    pruns.AddRun(19816,inpath);  // CalboxTest
+//    cruns.AddRun(19820,inpath); // 3blue
+//    cruns.AddRun(19820,inpath);   // 1blue
 
     gStyle->SetOptStat(1111);
@@ -43,5 +50,5 @@
 
     MStatusDisplay *display = new MStatusDisplay;
-    display->SetUpdateTime(500);
+    display->SetUpdateTime(3000);
     display->Resize(850,700);
 
@@ -95,4 +102,5 @@
     MHCalibrationChargePINDiode histpin;
     MHCalibrationChargeBlindPix histblind;
+//    histblind.SetSinglePheCut(80);
     //
     // As long, as we don't have digital modules,
@@ -110,5 +118,5 @@
     plist.AddToList(&histtime);
     plist.AddToList(&histcharge);
-    plist.AddToList(&histpin);
+//    plist.AddToList(&histpin);
     plist.AddToList(&histblind);
 
@@ -120,4 +128,6 @@
     MExtractPINDiode       pincalc;
     MExtractBlindPixel     blindcalc;
+//    blindcalc.SetRange(11,16);
+
     MArrivalTimeCalc2      timecalc;
     MCalibrationChargeCalc calcalc;
@@ -125,5 +135,5 @@
     
     MFillH filltime( "MHCalibrationRelTimeCam"    , "MArrivalTimeCam");
-    MFillH fillpin  ("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
+//   MFillH fillpin  ("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
     MFillH fillcam  ("MHCalibrationChargeCam"     , "MExtractedSignalCam");
@@ -139,4 +149,5 @@
     //
     MFCosmics            cosmics;
+    cosmics.SetMaxEmptyPixels(0.4);
     MContinue            cont(&cosmics);
 
@@ -145,5 +156,5 @@
     tlist.AddToList(&sigcalc2);
     tlist.AddToList(&blindcalc);
-    tlist.AddToList(&pincalc);
+//    tlist.AddToList(&pincalc);
     //
     // In case, you want to skip the cosmics rejection, 
@@ -189,5 +200,6 @@
     //
     histblind.DrawClone("all");
-    histcharge[5].DrawClone("time");
+    histcharge[5].DrawClone("all");
+    histcharge(5).DrawClone("all");
     histtime[5].DrawClone("fourierevents");
 
@@ -469,5 +481,5 @@
       c.cd(i+2*j);
       gPad->SetBorderMode(0);
-      TH1D *obj2 = (TH1D*)obj1->Projection();
+      TH1D *obj2 = (TH1D*)obj1->Projection(obj1.GetName());
       
 //      obj2->Sumw2();
@@ -558,4 +570,27 @@
         }
       
+        // Just to get the right (maximum) binning
+        TH1D *half[2];
+        half[0] = obj1->Projection("Sector 6-1-2");
+        half[1] = obj1->Projection("Sector 3-4-5");
+
+        half[0]->Reset();
+        half[1]->Reset();
+
+        TH1D *dummy = obj1->Projection("Dummy");
+
+        for (int i=1; i<7/*obj1->GetGeomCam().GetNumSectors()*/; i++)
+            half[(i/3)%2]->Add(obj1->ProjectionS(i, "Dummy"));
+
+        for (int i=0; i<2; i++)
+        {
+            half[i]->SetLineColor(kRed+i);
+            half[i]->SetDirectory(0);
+            half[i]->SetBit(kCanDelete);
+            half[i]->Draw("same");
+        }
+
+        delete dummy;
+
       gPad->Modified();
       gPad->Update();
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3359)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3360)
@@ -78,5 +78,5 @@
 {
 
-  TH1D *obj2 = (TH1D*)obj1->Projection();
+  TH1D *obj2 = (TH1D*)obj1->Projection(obj1->GetName());
   obj2->Draw();
   obj2->SetBit(kCanDelete);