Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 3256)
+++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 3257)
@@ -17,4 +17,6 @@
 #pragma link C++ class MHCalibrationPixel+;
 #pragma link C++ class MHCalibrationChargePix+;
+#pragma link C++ class MHCalibrationChargeHiGainPix+;
+#pragma link C++ class MHCalibrationChargeLoGainPix+;
 #pragma link C++ class MHCalibrationChargePINDiode+;
 #pragma link C++ class MHCalibrationRelTimePix+;
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc	(revision 3257)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc	(revision 3257)
@@ -0,0 +1,110 @@
+/* ======================================================================== *\
+!
+! *
+! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+! * Software. It is distributed to you in the hope that it can be a useful
+! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+! * It is distributed WITHOUT ANY WARRANTY.
+! *
+! * Permission to use, copy, modify and distribute this software and its
+! * documentation for any purpose is hereby granted without fee,
+! * provided that the above copyright notice appear in all copies and
+! * that both that copyright notice and this permission notice appear
+! * in supporting documentation. It is provided "as is" without express
+! * or implied warranty.
+! *
+!
+!
+!   Author(s): Markus Gaug 02/2004 <mailto:markus@ifae.es>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
+!
+!
+\* ======================================================================== */
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  MHCalibrationChargeHiGainPix
+//
+//  Performs all the necessary fits to extract the mean number of summed FADC slices
+//
+//////////////////////////////////////////////////////////////////////////////
+#include "MHCalibrationChargeHiGainPix.h"
+
+#include <TH1.h>
+#include <TPad.h>
+#include <TVirtualPad.h>
+#include <TCanvas.h>
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MParList.h"
+
+#include "MExtractedSignalCam.h"
+
+
+ClassImp(MHCalibrationChargeHiGainPix);
+
+using namespace std;
+
+const Int_t   MHCalibrationChargeHiGainPix::fgChargeNbins     = 200;
+const Axis_t  MHCalibrationChargeHiGainPix::fgChargeFirst     = -0.5;
+const Axis_t  MHCalibrationChargeHiGainPix::fgChargeLast      = 199.5;
+const Int_t   MHCalibrationChargeHiGainPix::fgAbsTimeNbins    = 30;
+const Axis_t  MHCalibrationChargeHiGainPix::fgAbsTimeFirst    = -0.5;
+const Axis_t  MHCalibrationChargeHiGainPix::fgAbsTimeLast     = 29.5;
+// --------------------------------------------------------------------------
+//
+// Default Constructor. 
+//
+MHCalibrationChargeHiGainPix::MHCalibrationChargeHiGainPix(const char *name, const char *title)
+    : fPix(NULL)
+{
+
+  fName  = name  ? name  : "MHCalibrationChargeHiGainPix";
+  fTitle = title ? title : "Fill the FADC sums of the HiGainPix events and perform the fits";
+  
+  SetChargeNbins();
+  SetChargeFirst();
+  SetChargeLast();
+  
+  SetAbsTimeNbins();
+  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);
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h	(revision 3257)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h	(revision 3257)
@@ -0,0 +1,48 @@
+#ifndef MARS_MHCalibrationChargeHiGainPix
+#define MARS_MHCalibrationChargeHiGainPix
+
+
+#ifndef MARS_MHCalibrationChargePix
+#include "MHCalibrationChargePix.h"
+#endif
+
+class MCalibrationChargePix;
+class MHCalibrationChargeHiGainPix : public MHCalibrationChargePix
+{
+private:
+
+  MCalibrationChargePix *fPix;            //! Storage container of the results
+
+  static const Int_t   fgChargeNbins;
+  static const Axis_t  fgChargeFirst;
+  static const Axis_t  fgChargeLast;  
+
+  static const Int_t   fgAbsTimeNbins;
+  static const Axis_t  fgAbsTimeFirst;
+  static const Axis_t  fgAbsTimeLast;
+
+public:
+
+  MHCalibrationChargeHiGainPix(const char *name=NULL, const char *title=NULL);
+  ~MHCalibrationChargeHiGainPix(){}
+
+  void Init();
+  
+  // Setters
+  void SetChargeNbins(const Int_t  bins =fgChargeNbins)          { fChargeNbins = bins;     }
+  void SetChargeFirst(const Axis_t first=fgChargeFirst)          { fChargeFirst = first;    }
+  void SetChargeLast (const Axis_t last =fgChargeLast)           { fChargeLast  = last;     }
+  
+  void SetAbsTimeNbins(const Int_t  bins =fgAbsTimeNbins)        { fAbsTimeNbins = bins;    }
+  void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst)        { fAbsTimeFirst = first;   }
+  void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast)         { fAbsTimeLast  = last;    }
+
+  void SetPix         (MCalibrationChargePix *pix )              { fPix          = pix;     }                
+
+  ClassDef(MHCalibrationChargeHiGainPix, 1)  // Histogram class for a Calibration Pixel with extracted Hi Gain 
+};
+
+#endif
+
+
+
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc	(revision 3257)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc	(revision 3257)
@@ -0,0 +1,101 @@
+/* ======================================================================== *\
+!
+! *
+! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+! * Software. It is distributed to you in the hope that it can be a useful
+! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+! * It is distributed WITHOUT ANY WARRANTY.
+! *
+! * Permission to use, copy, modify and distribute this software and its
+! * documentation for any purpose is hereby granted without fee,
+! * provided that the above copyright notice appear in all copies and
+! * that both that copyright notice and this permission notice appear
+! * in supporting documentation. It is provided "as is" without express
+! * or implied warranty.
+! *
+!
+!
+!   Author(s): Markus Gaug 02/2004 <mailto:markus@ifae.es>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
+!
+!
+\* ======================================================================== */
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  MHCalibrationChargeLoGainPix
+//
+//  Performs all the necessary fits to extract the mean number of summed FADC slices
+//
+//////////////////////////////////////////////////////////////////////////////
+#include "MHCalibrationChargeLoGainPix.h"
+
+#include <TH1.h>
+#include <TPad.h>
+#include <TVirtualPad.h>
+#include <TCanvas.h>
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MParList.h"
+
+#include "MExtractedSignalCam.h"
+
+
+ClassImp(MHCalibrationChargeLoGainPix);
+
+using namespace std;
+
+const Int_t   MHCalibrationChargeLoGainPix::fgChargeNbins     = 200;
+const Axis_t  MHCalibrationChargeLoGainPix::fgChargeFirst     = -0.5;
+const Axis_t  MHCalibrationChargeLoGainPix::fgChargeLast      = 199.5;
+const Int_t   MHCalibrationChargeLoGainPix::fgAbsTimeNbins    = 30;
+const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeFirst    = -0.5;
+const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeLast     = 29.5;
+// --------------------------------------------------------------------------
+//
+// Default Constructor. 
+//
+MHCalibrationChargeLoGainPix::MHCalibrationChargeLoGainPix(const char *name, const char *title)
+    : fPix(NULL)
+{
+
+  fName  = name  ? name  : "MHCalibrationChargeLoGainPix";
+  fTitle = title ? title : "Fill the FADC sums of the Low Gain events and perform the fits";
+  
+  SetChargeNbins();
+  SetChargeFirst();
+  SetChargeLast();
+  
+  SetAbsTimeNbins();
+  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);
+
+}
+
+
+
+
+
+
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h	(revision 3257)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h	(revision 3257)
@@ -0,0 +1,48 @@
+#ifndef MARS_MHCalibrationChargeLoGainPix
+#define MARS_MHCalibrationChargeLoGainPix
+
+
+#ifndef MARS_MHCalibrationChargePix
+#include "MHCalibrationChargePix.h"
+#endif
+
+class MCalibrationChargePix;
+class MHCalibrationChargeLoGainPix : public MHCalibrationChargePix
+{
+private:
+
+  MCalibrationChargePix *fPix;            //! Storage container of the results
+
+  static const Int_t   fgChargeNbins;
+  static const Axis_t  fgChargeFirst;
+  static const Axis_t  fgChargeLast;  
+
+  static const Int_t   fgAbsTimeNbins;
+  static const Axis_t  fgAbsTimeFirst;
+  static const Axis_t  fgAbsTimeLast;
+
+public:
+
+  MHCalibrationChargeLoGainPix(const char *name=NULL, const char *title=NULL);
+  ~MHCalibrationChargeLoGainPix(){}
+
+  void Init();
+  
+  // Setters
+  void SetChargeNbins(const Int_t  bins =fgChargeNbins)          { fChargeNbins = bins;     }
+  void SetChargeFirst(const Axis_t first=fgChargeFirst)          { fChargeFirst = first;    }
+  void SetChargeLast (const Axis_t last =fgChargeLast)           { fChargeLast  = last;     }
+  
+  void SetAbsTimeNbins(const Int_t  bins =fgAbsTimeNbins)        { fAbsTimeNbins = bins;    }
+  void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst)        { fAbsTimeFirst = first;   }
+  void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast)         { fAbsTimeLast  = last;    }
+
+  void SetPix         (MCalibrationChargePix *pix )              { fPix          = pix;     }                
+
+  ClassDef(MHCalibrationChargeLoGainPix, 1)  // Histogram class for a Calibration Pixel with extracted Low Gain 
+};
+
+#endif
+
+
+
Index: /trunk/MagicSoft/Mars/mcalib/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 3256)
+++ /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 3257)
@@ -47,4 +47,6 @@
            MHCalibrationPixel.cc \
            MHCalibrationChargePix.cc \
+           MHCalibrationChargeHiGainPix.cc \
+           MHCalibrationChargeLoGainPix.cc \
            MHCalibrationChargePINDiode.cc \
            MHCalibrationRelTimeCam.cc \
