Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2544)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2545)
@@ -6,4 +6,7 @@
 
   2003/11/20: Markus Gaug
+
+   * macros/calibration.C
+     - all variables are now plotted in camera displays
 
    * manalysis/MCalibrationPix:
Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2544)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 2545)
@@ -26,4 +26,5 @@
              TString calname="./20031102_02400_D_Flip500Hz_E.root")
 {
+
     //
     // Create a empty Parameter List and an empty Task List
@@ -43,7 +44,9 @@
     read.DisableAutoScheme();
 
-    MGeomApply geomapl;
+    MGeomApply     geomapl;
+    MGeomCamMagic  geomcam;
+    MGeomCam       geom;
     MPedCalcPedRun pedcalc;
-    //    MPedestalCam   pedcam;
+    MPedestalCam   pedcam;
 
     tlist.AddToList(&read);
@@ -51,13 +54,21 @@
     tlist.AddToList(&pedcalc);
 
-    //    plist.AddToList(&pedcam);
-
-    MHCamEvent hist;
+    plist.AddToList(&pedcam);
+
+    MHCamEvent hist("Pedestal");
     hist.SetType(1);
     plist.AddToList(&hist);
-    MFillH fill("MHCamEvent", "MPedestalCam");
+    MFillH fill(&hist, "MPedestalCam");
 
     tlist.AddToList(&fill);
 
+    //
+    // Update frequency by default = 1Hz
+    //
+    MStatusDisplay *d = new MStatusDisplay;
+ 
+    // Set update time to 3s
+    d->SetUpdateTime(3000);
+ 
     //
     // Create and setup the eventloop
@@ -65,4 +76,5 @@
     MEvtLoop evtloop;
     evtloop.SetParList(&plist);
+    evtloop.SetDisplay(d);  	
 
     //
@@ -74,9 +86,6 @@
     tlist.PrintStatistics();
 
-    // plist.FindObject("MPedestalCam")->Print();
-
     //
     // Create a empty Parameter List and an empty Task List
-    // The tasklist is identified in the eventloop by its name
     //
     MParList  plist2;
@@ -88,5 +97,5 @@
 
     MGeomApply geomapl2;
-    tlist2.AddToList(&geomapl2);
+    tlist2.AddToList(&geomapl);
 
     //
@@ -100,4 +109,7 @@
     MCalibrationCalc calcalc;
     calcalc.SetSkipTFits();
+
+    plist2.AddToList(&geomcam);
+
     //
     // As long, as we don't have digital modules, 
@@ -109,4 +121,10 @@
     tlist2.AddToList(&calcalc);
 
+    MHCamEvent hist2;
+    hist2.SetType(0);
+    plist2.AddToList(&hist2);
+    MFillH fill2("MHCamEvent", "MCalibrationCam");
+    tlist2.AddToList(&fill2);
+
     //
     // Create and setup the eventloop
@@ -123,53 +141,100 @@
     tlist2.PrintStatistics();
 
-    plist2.FindObject("MCalibrationCam")->Print();
+ //   plist2.FindObject("MCalibrationCam")->Print();
+
     //
     // just one example how to get the plots of individual pixels
     //
     MCalibrationCam *cam = plist2.FindObject("MCalibrationCam");
-    MCalibrationPix *pix = cam->GetCalibrationPix(560);
+    MCalibrationPix *pix = cam->GetCalibrationPix(523);
     pix->Draw();
 
-    /* 
-    TCanvas *c = MH::MakeDefCanvas();
-    c->Divide(3, 2);
-
-    MHCamEvent &h = *(MHCamEvent*)plist->FindObject("MHCamEvent");
-    MHCamera *disp0 = h.GetHistByName();
-    MHCamera *disp1 = new MHCamera(geom, "MPedestalCam;avg", "Pedestals Avarage");
-    MHCamera *disp2 = new MHCamera(geom, "MPedestalCam;rms", "Pedestals Avarage Error");
-    MHCamera *disp3 = new MHCamera(geom, "MPedestalCam;rel", "Pedestals Avarage ERR/VAL");
+    TCanvas *c1 = MH::MakeDefCanvas("Calibration1","Plots of FADC Charges",700,900);
+    c1->Divide(5, 2);
+
+    MHCamEvent &h    = *(MHCamEvent*)plist2->FindObject("MHCamEvent");
+    MHCamera *disp0  = h.GetHistByName();
+    MHCamera *disp1  = new MHCamera(geomcam, "MCalibrationCam;q", "Fitted Mean Charges");
+    MHCamera *disp2  = new MHCamera(geomcam, "MCalibrationCam;errq", "Error of Fitted Mean Charges");
+    MHCamera *disp3  = new MHCamera(geomcam, "MCalibrationCam;sigmaq", "Sigma of Fitted Mean Charges");
+    MHCamera *disp4  = new MHCamera(geomcam, "MCalibrationCam;errsigmaq", "Error of Sigma of Fitted Mean Charges");
+    MHCamera *disp5  = new MHCamera(geomcam, "MCalibrationCam;probq", "Probability of Fit");
+    MHCamera *disp6  = new MHCamera(geomcam, "MCalibrationCam;t", "Arrival Times");
+    MHCamera *disp7  = new MHCamera(geomcam, "MCalibrationCam;sigmat", "Sigma of Arrival Times");
+    MHCamera *disp8  = new MHCamera(geomcam, "MCalibrationCam;probt", "Probability of Time Fit");
+    MHCamera *disp9  = new MHCamera(geomcam, "MCalibrationCam;ped", "Pedestals");
+    MHCamera *disp10 = new MHCamera(geomcam, "MCalibrationCam;pedrms", "Pedestal RMS");
+    MHCamera *disp11 = new MHCamera(geomcam, "MCalibrationCam;rq", "Reduced Charges");
+    MHCamera *disp12 = new MHCamera(geomcam, "MCalibrationCam;errrq", "Error of Reduced Charges");
+
     disp1->SetBit(kCanDelete);
     disp2->SetBit(kCanDelete);
     disp3->SetBit(kCanDelete);
-
-    disp1->SetCamContent(*disp0, 0);
-    disp2->SetCamContent(*disp0, 1);
-    disp3->SetCamContent(*disp0, 2);
-
-    disp1->SetYTitle("P [au]");
-    disp2->SetYTitle("\\sigma_{P} [au]");
-    disp3->SetYTitle("\\sigma_{P} [%]");
-
-    TText text(0.1, 0.5, &fname[fname.Last('/')+1]);
-    text.SetTextSize(0.015);
-    text.DrawClone();
-
-    c->cd(1);
+    disp4->SetBit(kCanDelete);
+    disp5->SetBit(kCanDelete);
+    disp6->SetBit(kCanDelete);
+    disp7->SetBit(kCanDelete);
+    disp8->SetBit(kCanDelete);
+    disp9->SetBit(kCanDelete);
+    disp10->SetBit(kCanDelete);
+    disp11->SetBit(kCanDelete);
+    disp12->SetBit(kCanDelete);
+
+    disp1->SetCamContent(*cam, 0);
+    disp2->SetCamContent(*cam, 1);
+    disp3->SetCamContent(*cam, 2);
+    disp4->SetCamContent(*cam, 3);
+    disp5->SetCamContent(*cam, 4);
+    disp6->SetCamContent(*cam, 5);
+    disp7->SetCamContent(*cam, 6);
+    disp8->SetCamContent(*cam, 7);
+    disp9->SetCamContent(*cam, 8);
+    disp10->SetCamContent(*cam, 9);
+    disp11->SetCamContent(*cam, 10);
+    disp12->SetCamContent(*cam, 11);
+
+    disp1->SetYTitle("Q [FADC counts]");
+    disp2->SetYTitle("\\Delta_{Q} [FADC counts]");
+    disp3->SetYTitle("\\sigma_{Q} [FADC counts]");
+    disp4->SetYTitle("\\Delta_{\\sigma_{Q}} [FADC counts]");
+    disp5->SetYTitle("P [au]");
+    disp6->SetYTitle("T [FADC slices]");
+    disp7->SetYTitle("\\Delta_{T} [FADC slices]");
+    disp8->SetYTitle("P [au]");
+    disp9->SetYTitle("P [FADC counts/ slice ]");
+    disp10->SetYTitle("RMS_{P} [FADC counts / slice ]");
+    disp11->SetYTitle("Q [FADC counts]");
+    disp12->SetYTitle("\\Delta_{Q} [FADC counts]");
+
+//    TText text(0.1, 0.5, &fname[fname.Last('/')+1]);
+//    text.SetTextSize(0.015);
+//    text.DrawClone();
+
+    c1->cd(1);
     gStyle->SetOptStat(1111);
     disp1->Draw("hist");
     gPad->Update();
 
-    c->cd(2);
+    c1->cd(2);
     gStyle->SetOptStat(1101);
     disp2->Draw("hist");
     gPad->Update();
 
-    c->cd(3);
+    c1->cd(3);
     gStyle->SetOptStat(1101);
     disp3->Draw("hist");
     gPad->Update();
 
-    c->cd(4);
+    c1->cd(4);
+    gStyle->SetOptStat(1101);
+    disp4->Draw("hist");
+    gPad->Update();
+
+    c1->cd(5);
+    gStyle->SetOptStat(1101);
+    disp5->Draw("hist");
+    gPad->Update();
+
+    c1->cd(6);
     gPad->SetBorderMode(0);
     gPad->Divide(1,1);
@@ -177,5 +242,5 @@
     disp1->Draw();
 
-    c->cd(5);
+    c1->cd(7);
     gPad->SetBorderMode(0);
     gPad->Divide(1,1);
@@ -183,5 +248,5 @@
     disp2->Draw();
 
-    c->cd(6);
+    c1->cd(8);
     gPad->SetBorderMode(0);
     gPad->Divide(1,1);
@@ -189,9 +254,108 @@
     disp3->Draw();
 
-    c->SaveAs(fname(0, fname.Last('.')+1) + "ps");
+    c1->cd(9);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp4->Draw();
+
+    c1->cd(10);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp5->Draw();
+
+    TCanvas *c2 = MH::MakeDefCanvas("Calibration2","Plots of Arrival Times",700,900);
+    c2->Divide(3, 2);
+
+    c2->cd(1);
+    gStyle->SetOptStat(1111);
+    disp6->Draw("hist");
+    gPad->Update();
+
+    c2->cd(2);
+    gStyle->SetOptStat(1101);
+    disp7->Draw("hist");
+    gPad->Update();
+
+    c2->cd(3);
+    gStyle->SetOptStat(1101);
+    disp8->Draw("hist");
+    gPad->Update();
+
+    c2->cd(4);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp6->Draw();
+
+    c2->cd(5);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp7->Draw();
+
+    c2->cd(6);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp8->Draw();
+
+
+    TCanvas *c3 = MH::MakeDefCanvas("Calibration3","Plots of Pedestals",700,900);
+    c3->Divide(2, 2);
+
+    c3->cd(1);
+    gStyle->SetOptStat(1111);
+    disp9->Draw("hist");
+    gPad->Update();
+
+    c3->cd(2);
+    gStyle->SetOptStat(1101);
+    disp10->Draw("hist");
+    gPad->Update();
+
+    c3->cd(3);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp9->Draw();
+
+    c3->cd(4);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp10->Draw();
+
+    TCanvas *c4 = MH::MakeDefCanvas("Calibration4","Plots of Reduced Charges",700,900);
+    c3->Divide(2, 2);
+
+    c4->cd(1);
+    gStyle->SetOptStat(1111);
+    disp11->Draw("hist");
+    gPad->Update();
+
+    c4->cd(2);
+    gStyle->SetOptStat(1101);
+    disp12->Draw("hist");
+    gPad->Update();
+
+    c4->cd(3);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp11->Draw();
+
+    c4->cd(4);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    disp12->Draw();
+
+
+
+//    c->SaveAs(fname(0, fname.Last('.')+1) + "ps");
     //c->SaveAs(fname(0, fname.Last('.')+1) + "root");
 
-    */
-
 }