Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2626)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 2627)
@@ -23,6 +23,6 @@
 \* ======================================================================== */
 
-void calibration(TString pedname="../../Mars-0.8.2/20031102_02399_P_Unavailable_E.root", 
-                 TString calname="../../Mars-0.8.2/20031102_02400_D_Flip500Hz_E.root")
+void calibration(TString pedname="/data/MAGIC/rootdata/2003_12_01/20031130_03340_P_CrabNebula_E.root",
+                 TString calname="/data/MAGIC/rootdata/2003_12_01/20031130_03341_C_CrabNebula_E.root")
 {
 
@@ -62,8 +62,8 @@
     tlist.AddToList(&fill);
 
-    //    MStatusDisplay *d1 = new MStatusDisplay;
+    MStatusDisplay *d1 = new MStatusDisplay;
  
     // Set update time to 3s
-    //    d1->SetUpdateTime(3000);
+    d1->SetUpdateTime(3000);
  
     //
@@ -72,5 +72,5 @@
     MEvtLoop evtloop;
     evtloop.SetParList(&plist);
-    //    evtloop.SetDisplay(d1);  	
+    evtloop.SetDisplay(d1);  	
 
     //
@@ -114,5 +114,5 @@
     // we have to set the color of the pulser LED by hand
     //
-    calcalc.SetPulserColor(MCalibrationCalc::kEBlue);
+    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
 
     tlist2.AddToList(&read2);
@@ -145,22 +145,4 @@
     cam.Print();
 
-    Int_t pixnr;
-
-    while (1) 
-      {
-        
-        cout << "Which pixel number do you want to display? (Press 0 to exit)" << endl;
-        cin >> pixnr;
-        if (pixnr == 0)
-          break;
-        
-        if (pixnr >= 577)
-          break;
-        
-        MCalibrationPix *pix = cam->GetCalibrationPix(pixnr);
-        pix->Draw();
-    
-      }
-    
     //
     // Here we are confronted to a serious bug in ROOT:
@@ -174,7 +156,7 @@
     MHCamera &disp0  = *h.GetHistByName();
     MHCamera disp1   (geomcam, "MCalibrationCam;q", "Fitted Mean Charges");
-    MHCamera disp2   (geomcam, "MCalibrationCam;errq", "Error of Fitted Mean Charges");
+    //    MHCamera disp2   (geomcam, "MCalibrationCam;errq", "Error of Fitted Mean Charges");
     MHCamera disp3   (geomcam, "MCalibrationCam;sigmaq", "Sigma of Fitted Mean Charges");
-    MHCamera disp4   (geomcam, "MCalibrationCam;errsigmaq", "Error of Sigma of Fitted Mean Charges");
+    //    MHCamera disp4   (geomcam, "MCalibrationCam;errsigmaq", "Error of Sigma of Fitted Mean Charges");
     MHCamera disp5   (geomcam, "MCalibrationCam;probq", "Probability of Fit");
     MHCamera disp6   (geomcam, "MCalibrationCam;t", "Arrival Times");
@@ -183,33 +165,41 @@
     MHCamera disp9   (geomcam, "MCalibrationCam;ped", "Pedestals");
     MHCamera disp10  (geomcam, "MCalibrationCam;pedrms", "Pedestal RMS");
-    MHCamera disp11  (geomcam, "MCalibrationCam;rq", "Reduced Charges");
-    MHCamera disp12  (geomcam, "MCalibrationCam;rsigma", "Reduced Sigmas");
-    MHCamera disp13  (geomcam, "MCalibrationCam;phe", "Nr. of Phe's (F-Factor Method)");
-    MHCamera disp14  (geomcam, "MCalibrationCam;convphe", "Conversion Factor (F-Factor Method)");
-    MHCamera disp15  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
-    MHCamera disp16  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
+    MHCamera disp11  (geomcam, "MCalibrationCam;rsigma", "Reduced Sigmas");
+    MHCamera disp12  (geomcam, "MCalibrationCam;phe", "Nr. of Phe's (F-Factor Method)");
+    MHCamera disp13  (geomcam, "MCalibrationCam;convphe", "Conversion Factor (F-Factor Method)");
+    MHCamera disp14  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
+    MHCamera disp15  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
 
     disp1.SetCamContent(*cam, 0);
-    disp2.SetCamContent(*cam, 1);
+    disp1.SetCamError(*cam,1);
+    //    disp2.SetCamContent(*cam, 1);
+
     disp3.SetCamContent(*cam, 2);
-    disp4.SetCamContent(*cam, 3);
+    disp3.SetCamError(*cam,3);
+    //    disp4.SetCamContent(*cam, 3);
     disp5.SetCamContent(*cam, 4);
+
     disp6.SetCamContent(*cam, 5);
+    disp6.SetCamError(*cam,6);
     disp7.SetCamContent(*cam, 6);
     disp8.SetCamContent(*cam, 7);
+
     disp9.SetCamContent(*cam, 8);
+    disp9.SetCamError(*cam,9);
     disp10.SetCamContent(*cam, 9);
+
     disp11.SetCamContent(*cam, 10);
+
     disp12.SetCamContent(*cam, 11);
     disp13.SetCamContent(*cam, 12);
     disp14.SetCamContent(*cam, 13);
     disp15.SetCamContent(*cam, 14);
-    disp16.SetCamContent(*cam, 15);
+    //    disp16.SetCamError(*cam, 16);
 
 
     disp1.SetYTitle("Q [FADC counts]");
-    disp2.SetYTitle("\\Delta Q [FADC counts]");
+    //    disp2.SetYTitle("\\Delta Q [FADC counts]");
     disp3.SetYTitle("\\sigma_{Q} [FADC counts]");
-    disp4.SetYTitle("\\Delta {\\sigma_{Q}} [FADC counts]");
+    //    disp4.SetYTitle("\\Delta {\\sigma_{Q}} [FADC counts]");
     disp5.SetYTitle("P [au]");
     disp6.SetYTitle("T [FADC slices]");
@@ -218,10 +208,9 @@
     disp9.SetYTitle("P [FADC counts/ slice ]");
     disp10.SetYTitle("RMS_{P} [FADC counts / slice ]");
-    disp11.SetYTitle("Q [FADC counts]");
-    disp12.SetYTitle("\\sigma^2_{Q} - RMS^2_{P} [FADC counts^2]");
-    disp13.SetYTitle("Nr Phe's");
-    disp14.SetYTitle("Conversion Factor [Phe/FADC count]");
-    disp15.SetYTitle("Nr Photons");
-    disp16.SetYTitle("Conversion Factor [Ph/FADC count]");
+    disp11.SetYTitle("\\sigma^2_{Q} - RMS^2_{P} [FADC counts^2]");
+    disp12.SetYTitle("Nr Phe's");
+    disp13.SetYTitle("Conversion Factor [Phe/FADC count]");
+    disp14.SetYTitle("Nr Photons");
+    disp15.SetYTitle("Conversion Factor [Ph/FADC count]");
 
     MStatusDisplay *d2 = new MStatusDisplay;
@@ -230,5 +219,5 @@
     d2->SetUpdateTime(1000);
 
-    TCanvas *c1 = &d2->AddTab("Charges Mean"); 
+    TCanvas *c1 = &d2->AddTab("Fitted Charges"); 
     c1->Divide(2, 2);
 
@@ -238,4 +227,5 @@
     gStyle->SetOptStat(1111);
     obj=disp1.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c1->cd(3);
@@ -245,5 +235,6 @@
     c1->cd(2);
     gStyle->SetOptStat(1101);
-    obj=disp2.DrawCopy("hist");
+    obj=disp3.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c1->cd(4);
@@ -251,23 +242,4 @@
     obj->Draw();
 
-    TCanvas *c11 = &d2->AddTab("Charges Sigma"); 
-    c11->Divide(2, 2);
-
-    c11->cd(1);
-    gStyle->SetOptStat(1101);
-    obj=disp3.DrawCopy("hist");
-
-    c11->cd(3);
-    gPad->SetBorderMode(0);
-    obj->Draw();
-
-    c11->cd(2);
-    gStyle->SetOptStat(1101);
-    obj=disp4.DrawCopy("hist");
-
-    c11->cd(4);
-    gPad->SetBorderMode(0);
-    obj->Draw();
-
 
     TCanvas *c12 = &d2->AddTab("Fit Prob."); 
@@ -277,4 +249,5 @@
     gStyle->SetOptStat(1101);
     obj=disp5.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c12->cd(2);
@@ -288,4 +261,5 @@
     gStyle->SetOptStat(1111);
     obj=disp6.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c2->cd(4);
@@ -295,4 +269,5 @@
     gStyle->SetOptStat(1101);
     obj=disp7.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c2->cd(5);
@@ -302,4 +277,5 @@
     gStyle->SetOptStat(1101);
     obj=disp8.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c2->cd(6);
@@ -312,4 +288,5 @@
     gStyle->SetOptStat(1111);
     obj=disp9.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c3->cd(3);
@@ -319,4 +296,5 @@
     gStyle->SetOptStat(1111);
     obj=disp10.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c3->cd(4);
@@ -324,18 +302,12 @@
 
     TCanvas *c4 = &d2->AddTab("Reduced Charges");
-    c4->Divide(2, 2);
+    c4->Divide(2,1);
 
     c4->cd(1);
     gStyle->SetOptStat(1111);
     obj=disp11.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c4->cd(3);
-    obj->Draw();
-
-    c4->cd(2);
-    gStyle->SetOptStat(1101);
-    obj=disp12.DrawCopy("hist");
-
-    c4->cd(4);
     obj->Draw();
 
@@ -345,12 +317,14 @@
     c5->cd(1);
     gStyle->SetOptStat(1111);
+    obj=disp12.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
+
+    c5->cd(3);
+    obj->Draw();
+
+    c5->cd(2);
+    gStyle->SetOptStat(1101);
     obj=disp13.DrawCopy("hist");
-
-    c5->cd(3);
-    obj->Draw();
-
-    c5->cd(2);
-    gStyle->SetOptStat(1101);
-    obj=disp14.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c5->cd(4);
@@ -362,19 +336,18 @@
     c6->cd(1);
     gStyle->SetOptStat(1111);
+    obj=disp14.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
+
+    c6->cd(3);
+    obj->Draw();
+
+    c6->cd(2);
+    gStyle->SetOptStat(1101);
     obj=disp15.DrawCopy("hist");
-
-    c6->cd(3);
-    obj->Draw();
-
-    c6->cd(2);
-    gStyle->SetOptStat(1101);
-    obj=disp16.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
 
     c6->cd(4);
     obj->Draw();
 
-
-#endif
-
 }