Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3114)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3115)
@@ -4,4 +4,13 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/02/12: Markus Gaug
+ 
+   * mbase/MArray.[h,cc]:
+     - changed name of StripZeros
+
+   * mcalib/MHGausEvent.cc:
+     - corrected call to StripZeros
+
+
  2004/02/12: Thomas Bretz
  
Index: trunk/MagicSoft/Mars/mbase/MArray.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MArray.cc	(revision 3114)
+++ trunk/MagicSoft/Mars/mbase/MArray.cc	(revision 3115)
@@ -47,5 +47,5 @@
 //  Cuts the last entries of an array containing only zeros.
 //
-void MArray::CutEdges(TArrayD &arr)
+void MArray::StripZeros(TArrayD &arr)
 {
     const Int_t n = arr.GetSize();
@@ -63,5 +63,5 @@
 //  Cuts the last entries of an array containing only zeros.
 //
-void MArray::CutEdges(TArrayF &arr)
+void MArray::StripZeros(TArrayF &arr)
 {
     const Int_t n = arr.GetSize();
Index: trunk/MagicSoft/Mars/mbase/MArray.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MArray.h	(revision 3114)
+++ trunk/MagicSoft/Mars/mbase/MArray.h	(revision 3115)
@@ -32,6 +32,6 @@
    virtual void Set(UInt_t n) = 0;
 
-   static void  CutEdges(TArrayF &arr);
-   static void  CutEdges(TArrayD &arr);
+   static void  StripZeros(TArrayF &arr);
+   static void  StripZeros(TArrayD &arr);        
    
    ClassDef(MArray, 1)  //Abstract array base class for TObject derived Arrays
Index: trunk/MagicSoft/Mars/mcalib/MCalibrate.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrate.h	(revision 3114)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrate.h	(revision 3115)
@@ -35,5 +35,5 @@
 public:
 
-    enum CalibrationMode_t{kNone=0,kBlindPixel,kFfactor,kPinDiode,kCombined};
+    enum CalibrationMode_t{kNone=0,kBlindPixel,kFfactor,kPinDiode,kCombined, kDummy};
     static const CalibrationMode_t kDefault = kBlindPixel;
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 3114)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 3115)
@@ -113,4 +113,5 @@
   CLRBIT(fFlags, kFFactorMethodValid);
   CLRBIT(fFlags, kPINDiodeMethodValid);
+  CLRBIT(fFlags, kCombinedMethodValid);
 
   fCharge                           =  -1.;
@@ -143,12 +144,15 @@
   fMeanConversionBlindPixelMethod   =  -1.;
   fMeanConversionPINDiodeMethod     =  -1.;
+  fMeanConversionCombinedMethod     =  -1.;
 
   fErrorConversionFFactorMethod     =  -1.;
   fErrorConversionBlindPixelMethod  =  -1.;
   fErrorConversionPINDiodeMethod    =  -1.;
+  fErrorConversionCombinedMethod    =  -1.;
 
   fSigmaConversionFFactorMethod     =  -1.;
   fSigmaConversionBlindPixelMethod  =  -1.;
   fSigmaConversionPINDiodeMethod    =  -1.;
+  fSigmaConversionCombinedMethod    =  -1.;
 
   fFactorCalculated = kFALSE;
@@ -191,4 +195,15 @@
   fErrorConversionFFactorMethod = err;
   fSigmaConversionFFactorMethod = sig;
+}
+
+// --------------------------------------------------------------------------
+//
+// Set the conversion factors from outside (only for MC)
+//
+void MCalibrationPix::SetConversionCombinedMethod(Float_t c, Float_t err, Float_t sig)
+{
+  fMeanConversionCombinedMethod = c;
+  fErrorConversionCombinedMethod = err;
+  fSigmaConversionCombinedMethod = sig;
 }
 
@@ -395,5 +410,14 @@
 }
 
-
+Float_t MCalibrationPix::GetTotalFFactorCombinedMethod() 
+{
+  return 1.;
+}
+
+Float_t MCalibrationPix::GetTotalFFactorErrorCombinedMethod() 
+{
+
+  return 1.;
+}
 
 Float_t MCalibrationPix::GetMeanConversionFFactorMethod()
@@ -485,4 +509,9 @@
 { 
   return TESTBIT(fFlags, kPINDiodeMethodValid);    
+}
+
+Bool_t MCalibrationPix::IsCombinedMethodValid() 
+{ 
+  return TESTBIT(fFlags, kCombinedMethodValid);    
 }
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h	(revision 3114)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h	(revision 3115)
@@ -56,12 +56,15 @@
   Float_t fMeanConversionBlindPixelMethod;  // The conversion factor to Ph's (Blind Pixel method)
   Float_t fMeanConversionPINDiodeMethod;    // The conversion factor to Ph's (PIN Diode method)
+  Float_t fMeanConversionCombinedMethod;    // The conversion factor to Ph's (all methods combined)
 
   Float_t fErrorConversionFFactorMethod;    // The error of the conversion factor to Phe's (F-factor method)
   Float_t fErrorConversionBlindPixelMethod; // The error of the conversion factor to Ph's (Blind Pixel method)
   Float_t fErrorConversionPINDiodeMethod;   // The error of the conversion factor to Ph's (PIN Diode method)
+  Float_t fErrorConversionCombinedMethod;   // The error of the conversion factor to Ph's (all methods combined)
 
   Float_t fSigmaConversionFFactorMethod;    // The sigma of conversion factor to Phe's (F-factor method)
   Float_t fSigmaConversionBlindPixelMethod; // The conversion factor to Ph's (Blind Pixel method)
   Float_t fSigmaConversionPINDiodeMethod;   // The conversion factor to Ph's (PIN Diode method)
+  Float_t fSigmaConversionCombinedMethod;   // The conversion factor to Ph's (all methods combined)
 
   Float_t fTotalFFactor;                    // The F-Factor of the total readout system (Sigma(out)/mean(out)*Mean(in)/sigma(in)
@@ -80,5 +83,5 @@
           kChargeValid, kTimeFitValid,
           kFitted, kOscillating, 
-          kBlindPixelMethodValid, kFFactorMethodValid, kPINDiodeMethodValid };
+          kBlindPixelMethodValid, kFFactorMethodValid, kPINDiodeMethodValid, kCombinedMethodValid };
   
   MHCalibrationPixel *fHist;                // Pointer to the histograms performing the fits, etc.  
@@ -128,4 +131,8 @@
   Float_t GetSigmaConversionPINDiodeMethod()   const { return fSigmaConversionPINDiodeMethod ; }
 
+  Float_t GetMeanConversionCombinedMethod()    const { return fMeanConversionCombinedMethod ;  }
+  Float_t GetErrorConversionCombinedMethod()   const { return fErrorConversionCombinedMethod ; }
+  Float_t GetSigmaConversionCombinedMethod()   const { return fSigmaConversionCombinedMethod ; }
+
   Float_t GetPheFFactorMethod();    
   Float_t GetPheFFactorMethodError();
@@ -144,4 +151,7 @@
   Float_t GetTotalFFactorPINDiodeMethod();
   Float_t GetTotalFFactorErrorPINDiodeMethod();
+
+  Float_t GetTotalFFactorCombinedMethod();
+  Float_t GetTotalFFactorErrorCombinedMethod();
   
   Bool_t IsExcluded()              const;
@@ -154,4 +164,5 @@
   Bool_t IsPINDiodeMethodValid()   const;
   Bool_t IsFFactorMethodValid();
+  Bool_t IsCombinedMethodValid();
 
   // Setter
@@ -164,4 +175,5 @@
   void SetConversionBlindPixelMethod(Float_t c, Float_t err, Float_t sig);
   void SetConversionPINDiodeMethod(Float_t c, Float_t err, Float_t sig);
+  void SetConversionCombinedMethod(Float_t c, Float_t err, Float_t sig);
 
   // Bit Setters
Index: trunk/MagicSoft/Mars/mcalib/MHGausEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHGausEvent.cc	(revision 3114)
+++ trunk/MagicSoft/Mars/mcalib/MHGausEvent.cc	(revision 3115)
@@ -177,5 +177,5 @@
   
   // This cuts only the non-used zero's, but MFFT will later cut the rest
-  MArray::CutEdges(*fEvents);
+  MArray::StripZeros(*fEvents);
 
   MFFT fourier;