Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3345)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3346)
@@ -4,4 +4,15 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/02/27: Markus Gaug
+ 
+   * mcalib/MHCalibrationChargePix.[h,cc]
+   * mcalib/MHCalibrationHiGainChargePix.[h,cc]
+   * mcalib/MHCalibrationLoGainChargePix.[h,cc]
+
+     - histogram name setting and title setting moved to constructor, 
+       Functions Init and ChangeHistId derive directly from 
+       MHcalibrationChargePix
+
+
  2004/02/27: Raducci Sebastian 
 
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc	(revision 3345)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc	(revision 3346)
@@ -72,42 +72,11 @@
   SetAbsTimeFirst();
   SetAbsTimeLast();
-}
-
-
-void MHCalibrationChargeHiGainPix::Init()
-{
 
   fHGausHist.SetName("HCalibrationChargeHiGainPix");
   fHGausHist.SetTitle("Distribution of Summed Hi Gain FADC slices Pixel ");  
-  fHGausHist.SetXTitle("Sum FADC Slices");
-  fHGausHist.SetYTitle("Nr. of events");
-  fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast);
-  //  fHGausHist.Sumw2();
 
   fHAbsTime.SetName("HAbsTimeHiGainPix");
   fHAbsTime.SetTitle("Distribution of Absolute Arrival Times Hi Gain Pixel ");  
-  fHAbsTime.SetXTitle("Absolute Arrival Time [FADC slice nr]");
-  fHAbsTime.SetYTitle("Nr. of events");
-  fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast);
-
 }
-
-
-
-void MHCalibrationChargeHiGainPix::ChangeHistId(Int_t id)
-{
-
-  fPixId = id;
-
-  fHGausHist.SetName(Form("%s%d", fHGausHist.GetName(), id));
-  fHGausHist.SetTitle(Form("%s%d", fHGausHist.GetTitle(), id));
-
-  fHAbsTime.SetName(Form("%s%d", fHAbsTime.GetName(), id));
-  fHAbsTime.SetTitle(Form("%s%d", fHAbsTime.GetTitle(), id));
-
-  fName  = Form("%s%d", fName.Data(), id);
-  fTitle = Form("%s%d", fTitle.Data(), id);
-}
-
 
 void MHCalibrationChargeHiGainPix::Draw(const Option_t *opt)
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc	(revision 3345)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc	(revision 3346)
@@ -71,23 +71,10 @@
   SetAbsTimeFirst();
   SetAbsTimeLast();
-}
-
-
-void MHCalibrationChargeLoGainPix::Init()
-{
 
   fHGausHist.SetName("HCalibrationChargeLoGainPix");
   fHGausHist.SetTitle("Distribution of Summed Hi Gain FADC slices Pixel ");  
-  fHGausHist.SetXTitle("Sum FADC Slices");
-  fHGausHist.SetYTitle("Nr. of events");
-  fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast);
-  //  fHGausHist.Sumw2();
 
   fHAbsTime.SetName("HAbsTimeLoGainPix");
   fHAbsTime.SetTitle("Distribution of Absolute Arrival Times Hi Gain Pixel ");  
-  fHAbsTime.SetXTitle("Absolute Arrival Time [FADC slice nr]");
-  fHAbsTime.SetYTitle("Nr. of events");
-  fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast);
-
 }
 
@@ -95,20 +82,15 @@
 
 
-void MHCalibrationChargeLoGainPix::ChangeHistId(Int_t id)
-{
-
-  fPixId = id;
-
-  fHGausHist.SetName(Form("%s%d", fHGausHist.GetName(), id));
-  fHGausHist.SetTitle(Form("%s%d", fHGausHist.GetTitle(), id));
-
-  fHAbsTime.SetName(Form("%s%d", fHAbsTime.GetName(), id));
-  fHAbsTime.SetTitle(Form("%s%d", fHAbsTime.GetTitle(), id));
-
-  fName  = Form("%s%d", fName.Data(), id);
-  fTitle = Form("%s%d", fTitle.Data(), id);
-}
 
 
 
 
+
+
+
+
+
+
+
+
+
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h	(revision 3345)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h	(revision 3346)
@@ -24,6 +24,4 @@
   ~MHCalibrationChargeLoGainPix(){}
 
-  void Init();
-  
   // Setters
   void SetChargeNbins(const Int_t  bins =fgChargeNbins)          { fChargeNbins = bins;     }
@@ -34,6 +32,4 @@
   void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst)        { fAbsTimeFirst = first;   }
   void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast)         { fAbsTimeLast  = last;    }
-
-  void ChangeHistId(Int_t i);
 
   ClassDef(MHCalibrationChargeLoGainPix, 1)  // Histogram class for a Calibration Pixel with extracted Low Gain 
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc	(revision 3345)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc	(revision 3346)
@@ -80,21 +80,8 @@
   SetPickupLimit();
 
-  fHAbsTime.UseCurrentStyle();
-  fHAbsTime.SetDirectory(NULL); 
-
-  Clear();
-  
-  SetPulserFrequency();
-}
-
-void MHCalibrationChargePix::Init()
-{
-
   fHGausHist.SetName("HCalibrationCharge");
   fHGausHist.SetTitle("Distribution of Summed FADC slices Pixel");  
   fHGausHist.SetXTitle("Sum FADC Slices");
   fHGausHist.SetYTitle("Nr. of events");
-  fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast);
-  fHGausHist.Sumw2();
 
   fHAbsTime.SetName("HAbsTimePixel");
@@ -102,6 +89,17 @@
   fHAbsTime.SetXTitle("Absolute Arrival Time [FADC slice nr]");
   fHAbsTime.SetYTitle("Nr. of events");
+  fHAbsTime.UseCurrentStyle();
+  fHAbsTime.SetDirectory(NULL); 
+
+  Clear();
+  
+  SetPulserFrequency();
+}
+
+void MHCalibrationChargePix::Init()
+{
+
+  fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast);
   fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast);
-
 }
 
@@ -134,4 +132,7 @@
   fHAbsTime.SetName(Form("%s%d", fHAbsTime.GetName(), id));
   fHAbsTime.SetTitle(Form("%s%d", fHAbsTime.GetTitle(), id));
+
+  fName  = Form("%s%d", fName.Data(), id);
+  fTitle = Form("%s%d", fTitle.Data(), id);
 }
 
@@ -182,11 +183,9 @@
   }
 
-  pad->SetTicks();
-  pad->SetBorderMode(0);
   pad->Divide(1,win);
   pad->cd(1);
 
   if (!IsEmpty())
-    pad->SetLogy();
+    gPad->SetLogy();
 
   MHGausEvents::Draw(opt);