Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 3909)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 3913)
@@ -55,24 +55,22 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-//static const TString inpath = "/home/rootdata/Calib/2004_04_16/";
-static const TString inpath = "/mnt/Data/rootdata/CrabNebula/2003_12_01/";
-static const Int_t pedrun  = 3340;
-static const Int_t calrun1 = 3341;
+static const TString inpath = "/mnt/Data/rootdata/Miscellaneous/2004_03_03/";
+static const Int_t pedrun  = 20123;
+static const Int_t calrun1 = 20126;
 static const Int_t calrun2 = 0;
-/*
-static const Int_t pedrun  = 22265;
-static const Int_t calrun1 = 22300;
-static const Int_t calrun2 = 0;
-*/
+
 void calibration(const Int_t prun=pedrun, const Int_t crun1=calrun1, const Int_t crun2=calrun2)
 {
 
   MExtractFixedWindowPeakSearch extractor;
-  extractor.SetRange(0,6,0,6);
+  //  extractor.SetRange(0,14,0,14);
 
-  /*
-  MExtractTimeSpline timeext;
-  timeext.SetRange(0,14,6,14);
-  */
+  // MExtractSlidingWindow  extractor;   
+  // MExtractFixedWindow    extractor;   
+
+  MExtractTimeHighestIntegral timeext;
+
+  // MExtractTimeSpline timeext;
+  // timeext.SetRange(0,14,6,14);
 
   MRunIter pruns;
@@ -137,6 +135,5 @@
   calloop.SetRelTimeCalibration();
   calloop.SetExtractor(&extractor);
-  //  calloop.SetArrivalTimeLevel(1);
-  //  calloop.SetTimeExtractor(&timeext);
+  calloop.SetTimeExtractor(&timeext);
   calloop.SetInput(&cruns);
   calloop.SetDisplay(display);