Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3604)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3605)
@@ -18,5 +18,5 @@
 !   Author(s): Markus Gaug, 11/2003 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -27,11 +27,12 @@
 {
 
-  const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_27/";
+  //  const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_27/";
+  const TString inpath = "/home/rootdata/BlindPixel/";
 
   MRunIter pruns;
   MRunIter cruns;
 
-  pruns.AddRun(12386,inpath);
-  cruns.AddRun(12525,inpath);
+  pruns.AddRun(22007,inpath);
+  cruns.AddRun(22006,inpath);
 
   gStyle->SetOptStat(1111);
@@ -101,5 +102,6 @@
   MHCalibrationChargePINDiode histpin;
   MHCalibrationChargeBlindPix histblind;
-  histblind.SetSinglePheCut(1000);
+  histcharge.SetPulserFrequency(500);
+  histblind.SetSinglePheCut(600);
   //
   // As long, as we don't have digital modules,
@@ -128,5 +130,5 @@
   MExtractBlindPixel     blindcalc;
   sigcalc2.SetRange(2,15,6,5,14,6);
-  blindcalc.SetRange(11,29);
+  blindcalc.SetRange(12,17);
 
   MArrivalTimeCalc2      timecalc;
@@ -187,4 +189,6 @@
   tlist.PrintStatistics();
   
+  MBadPixelsCam *badpixels = (MBadPixelsCam*)plist->FindObject("MBadPixelsCam");
+
   //
   // print the most important results of all pixels to a file
@@ -194,5 +198,5 @@
   gauglog.SetOutputFile(Form("%s%s",calcam.GetName(),".txt"),1);
   calcam.SetLogStream(&gauglog);
-  badcam.Print();
+  badpixels->Print();
   calcam.SetLogStream(&gLog);
   */
@@ -200,33 +204,33 @@
   // just one example how to get the plots of individual pixels
   //
-  //    histblind.DrawClone("all");
-  //  histcharge[5].DrawClone("all");
-  //    histcharge(5).DrawClone("all");
-  //    histtime[5].DrawClone("fourierevents");
+  //  histblind.DrawClone("all");
+  //  histcharge[555].DrawClone("all");
+  //  histcharge(5).DrawClone("all");
+  //  histtime[5].DrawClone("fourierevents");
   
   // Create histograms to display
-  MHCamera disp1  (geomcam, "Cal;Charge",         "Fitted Mean Charges");
-  MHCamera disp2  (geomcam, "Cal;SigmaCharge",    "Sigma of Fitted Charges");
-  MHCamera disp3  (geomcam, "Cal;FitProb",        "Probability of Fit");
-  MHCamera disp4  (geomcam, "Cal;RSigma",         "Reduced Sigmas");
-  MHCamera disp5  (geomcam, "Cal;RSigma/Charge",  "Reduced Sigma per Charge");
-  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)");
-  MHCamera disp9  (geomcam, "Cal;BlindPixConv",   "Conversion Factor to photons (Blind Pixel Method)");
-  MHCamera disp10 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)");
-  MHCamera disp11 (geomcam, "Cal;PINDiodeConv",   "Conversion Factor tp photons (PIN Diode Method)");
-  MHCamera disp12 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)");
-  MHCamera disp13 (geomcam, "Cal;Excluded",       "Pixels previously excluded");
-  MHCamera disp14 (geomcam, "Cal;NotFitted",      "Pixels that could not be fitted");
-  MHCamera disp15 (geomcam, "Cal;NotFitValid",    "Pixels with not valid fit results");
-  MHCamera disp16 (geomcam, "Cal;HiGainOscillating",     "Oscillating Pixels HI Gain");
-  MHCamera disp17 (geomcam, "Cal;LoGainOscillating",     "Oscillating Pixels LO Gain");
-  MHCamera disp18 (geomcam, "Cal;HiGainPickup",          "Number Pickup events Hi Gain");
-  MHCamera disp19 (geomcam, "Cal;LoGainPickup",          "Number Pickup events Lo Gain");
-  MHCamera disp20 (geomcam, "Cal;Saturation",            "Pixels with saturated Hi Gain");
-  MHCamera disp21 (geomcam, "Cal;FFactorValid",          "Pixels with valid F-Factor calibration");
-  MHCamera disp22 (geomcam, "Cal;BlindPixelValid",       "Pixels with valid BlindPixel calibration");
-  MHCamera disp23 (geomcam, "Cal;PINdiodeFFactorValid",  "Pixels with valid PINDiode calibration");
+  MHCamera disp1  (geomcam, "Cal;Charge",               "Fitted Mean Charges");
+  MHCamera disp2  (geomcam, "Cal;SigmaCharge",          "Sigma of Fitted Charges");
+  MHCamera disp3  (geomcam, "Cal;FitProb",              "Probability of Fit");
+  MHCamera disp4  (geomcam, "Cal;RSigma",               "Reduced Sigmas");
+  MHCamera disp5  (geomcam, "Cal;RSigma/Charge",        "Reduced Sigma per Charge");
+  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)");
+  MHCamera disp9  (geomcam, "Cal;BlindPixConv",         "Conversion Factor to photons (Blind Pixel Method)");
+  MHCamera disp10 (geomcam, "Cal;BlindPixFFactor",      "Total F-Factor (Blind Pixel Method)");
+  MHCamera disp11 (geomcam, "Cal;PINDiodeConv",         "Conversion Factor tp photons (PIN Diode Method)");
+  MHCamera disp12 (geomcam, "Cal;PINDiodeFFactor",      "Total F-Factor (PIN Diode Method)");
+  MHCamera disp13 (geomcam, "Cal;Excluded",             "Pixels previously excluded");
+  MHCamera disp14 (geomcam, "Cal;Unsuited",             "Unsuited Pixels  ");
+  MHCamera disp15 (geomcam, "Cal;Unreliable",           "Unreliable Pixels");
+  MHCamera disp16 (geomcam, "Cal;HiGainOscillating",    "Oscillating Pixels High Gain");
+  MHCamera disp17 (geomcam, "Cal;LoGainOscillating",    "Oscillating Pixels Low Gain");
+  MHCamera disp18 (geomcam, "Cal;HiGainPickup",         "Number Pickup events Hi Gain");
+  MHCamera disp19 (geomcam, "Cal;LoGainPickup",         "Number Pickup events Lo Gain");
+  MHCamera disp20 (geomcam, "Cal;Saturation",           "Pixels with saturated Hi Gain");
+  MHCamera disp21 (geomcam, "Cal;FFactorValid",         "Pixels with valid F-Factor calibration");
+  MHCamera disp22 (geomcam, "Cal;BlindPixelValid",      "Pixels with valid BlindPixel calibration");
+  MHCamera disp23 (geomcam, "Cal;PINdiodeFFactorValid", "Pixels with valid PINDiode calibration");
   
   MHCamera disp24 (geomcam, "Cal;Ped",         "Pedestals");
@@ -279,8 +283,8 @@
   // Pixels with defects
   disp13.SetCamContent(calcam,26);
-  disp14.SetCamContent(badcam,7);
-  disp15.SetCamContent(badcam,9);
-  disp16.SetCamContent(badcam,16);
-  disp17.SetCamContent(badcam,15);
+  disp14.SetCamContent(*badpixels,1);
+  disp15.SetCamContent(*badpixels,3);
+  disp16.SetCamContent(*badpixels,10);
+  disp17.SetCamContent(*badpixels,11);
   disp18.SetCamContent(calcam,27);
   disp19.SetCamContent(calcam,28);
@@ -314,7 +318,7 @@
   disp32.SetCamContent(calcam,35);
   
-  disp1.SetYTitle("Charge [FADC units]");
-  disp2.SetYTitle("\\sigma_{Charge} [FADC units]");
-  disp3.SetYTitle("P_{Charge} [1]");
+  disp1.SetYTitle("Mean Charge [FADC Counts]");
+  disp2.SetYTitle("\\sigma_{Charge} [FADC Counts]");
+  disp3.SetYTitle("P_{Sum} [1]");
   
   disp4.SetYTitle("\\sqrt{\\sigma^{2}_{Charge} - RMS^{2}_{Ped}} [FADC Counts]");
@@ -492,6 +496,15 @@
   gPad->SetBorderMode(0);
   gPad->SetTicks();
+  cam.GetXaxis()->SetLabelOffset(0.005);
+  cam.GetXaxis()->SetLabelSize(0.06);  
+  cam.GetYaxis()->SetLabelOffset(0.005);
+  cam.GetYaxis()->SetLabelSize(0.06);  
+  cam.GetXaxis()->SetTitleOffset(0.85);
+  cam.GetXaxis()->SetTitleSize(0.06);  
+  cam.GetYaxis()->SetTitleOffset(0.7);
+  cam.GetYaxis()->SetTitleSize(0.06);  
   MHCamera *obj1 = (MHCamera*)cam.DrawCopy("hist");
   obj1->SetDirectory(NULL);
+
 
   c.cd(i+j);
@@ -507,4 +520,12 @@
       TProfile *obj2 = obj1->RadialProfile(Form("%s%s",obj1->GetName(),"_rad"));
       obj2->SetDirectory(NULL);
+      obj2->GetXaxis()->SetLabelOffset(0.005);
+      obj2->GetXaxis()->SetLabelSize(0.06);  
+      obj2->GetYaxis()->SetLabelOffset(0.005);
+      obj2->GetYaxis()->SetLabelSize(0.06);  
+      obj2->GetXaxis()->SetTitleOffset(0.85);
+      obj2->GetXaxis()->SetTitleSize(0.06);  
+      obj2->GetYaxis()->SetTitleOffset(0.7);
+      obj2->GetYaxis()->SetTitleSize(0.06);  
       obj2->Draw();
       obj2->SetBit(kCanDelete);
@@ -538,4 +559,12 @@
       obj3->SetDirectory(NULL);
 //      obj3->Sumw2();
+      obj3->GetXaxis()->SetLabelOffset(0.005);
+      obj3->GetXaxis()->SetLabelSize(0.06);  
+      obj3->GetYaxis()->SetLabelOffset(0.005);
+      obj3->GetYaxis()->SetLabelSize(0.06);  
+      obj3->GetXaxis()->SetTitleOffset(0.85);
+      obj3->GetXaxis()->SetTitleSize(0.06);  
+      obj3->GetYaxis()->SetTitleOffset(0.7);
+      obj3->GetYaxis()->SetTitleSize(0.06);  
       obj3->Draw();
       obj3->SetBit(kCanDelete);
