Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 8365)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 8366)
@@ -218,4 +218,11 @@
 }
 
+Bool_t MHCalibrationCam::IsLoGain() const
+{
+    if (!fRunHeader)
+        return TESTBIT(fFlags,kLoGain);
+    return TESTBIT(fFlags,kLoGain) && fRunHeader->GetNumSamplesLoGain()>0;
+}
+
 void MHCalibrationCam::Remove(TOrdCollection *col)
 {
Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h	(revision 8365)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h	(revision 8366)
@@ -164,7 +164,7 @@
   Bool_t InitCams      ( MParList *plist, const TString name );
   
+  Bool_t IsLoGain() const;
   Bool_t IsAverageing  () const  { return TESTBIT(fFlags,kAverageing);   }
   Bool_t IsDebug       () const  { return TESTBIT(fFlags,kDebug);        }  
-  Bool_t IsLoGain      () const  { return TESTBIT(fFlags,kLoGain);       }
   Bool_t IsOscillations() const  { return TESTBIT(fFlags,kOscillations); }
   Bool_t IsSizeCheck   () const  { return TESTBIT(fFlags,kSizeCheck);    }
Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h	(revision 8365)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h	(revision 8366)
@@ -15,8 +15,8 @@
 
 class TH1F;
-class MRawEvtData;
 class MExtractedSignalCam;
 class MCalibrationChargePix;
 class MHCalibrationChargePix;
+class MPedestalSubtractedEvt;
 
 class MHCalibrationChargeCam : public MHCalibrationCam
@@ -87,6 +87,6 @@
   Float_t fTimeUpperLimit;                           // Limit dist. to last signal slice  (in units of FADC slices) 
   
-  MRawEvtData         *fRawEvt;                      //!  Raw event data 
-  MExtractedSignalCam *fSignal;                      //!
+  MPedestalSubtractedEvt *fRawEvt;                   //!  Raw event data
+  MExtractedSignalCam    *fSignal;                   //!
 
   Bool_t SetupHists(const MParList *pList);