Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1545)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1546)
@@ -7,4 +7,7 @@
      - Now the default pixel treatment is the same as originally: add 
        all FADC slices
+
+   * macros/MagicHillas.C
+     - changed accordingly to changes above.
 
  2002/10/16: Thomas Bretz
Index: trunk/MagicSoft/Mars/macros/MagicHillas.C
===================================================================
--- trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 1545)
+++ trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 1546)
@@ -101,5 +101,4 @@
     //  Example: use only 2nd to 6th FADC slices for photon calculation:
     //
-    //    MCerPhotCalc2 ncalc;
     //    const Float_t x[15]={0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     //    TArrayF w(15,x);
Index: trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 1545)
+++ trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 1546)
@@ -9,5 +9,4 @@
 #pragma link C++ class MCerPhotAnal+;
 #pragma link C++ class MCerPhotCalc+;
-#pragma link C++ class MCerPhotCalc2+;
 
 #pragma link C++ class MImgCleanStd+;
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h	(revision 1545)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h	(revision 1546)
@@ -6,6 +6,6 @@
 // MCerPhotCalc                                                            //
 //                                                                         //
-// Integrates the time slices of one pixel and substracts the pedestal     //
-// (offset) value                                                          //
+// Integrates the desired ADC time slices of one pixel and substracts the  //
+// pedestal (offset) value                                                 //
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
@@ -15,17 +15,25 @@
 #endif
 
+#include <TArrayF.h>
+
 class MRawEvtData;
 class MPedestalCam;
 class MCerPhotEvt;
 class MRawRunHeader;
+class TArrayF;
 
 class MCerPhotCalc : public MTask
 {
-    MPedestalCam  *fPedestals;  // Pedestals of all pixels in the camera
-    MRawEvtData   *fRawEvt;     // raw event data (time slices)
-    MCerPhotEvt   *fCerPhotEvt; // Cerenkov Photon Event used for calculation
-    MRawRunHeader *fRunHeader;  //  RunHeader information
+    MPedestalCam   *fPedestals;  // Pedestals of all pixels in the camera
+    MRawEvtData    *fRawEvt;     // raw event data (time slices)
+    MCerPhotEvt    *fCerPhotEvt; // Cerenkov Photon Event used for calculation
+    MRawRunHeader  *fRunHeader;  // RunHeader information
+ 
+    Bool_t          fEnableFix;  // fix for a bug in files from older camera versions (<=40)
 
-    Bool_t         fEnableFix;  // fix for a bug in files from older camera versions (<=40)
+    TArrayF         fWeight;  // Weights for adding up the ADC slices
+    Float_t         fSumQuadWeights;
+
+    void SetDefaultWeights();
 
 public:
@@ -34,9 +42,11 @@
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
+    Bool_t ReInit(MParList *pList);
 
-    Bool_t ReInit(MParList *pList);
+    void   SetWeights(TArrayF w) {fWeight.Set(w.GetSize(),w.GetArray());}
 
     ClassDef(MCerPhotCalc, 0)   // Task to calculate cerenkov photons from raw data
 };
+ 
 
 #endif