Index: trunk/MagicSoft/Mars/mtemp/mifae/Changelog
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/Changelog	(revision 4427)
+++ trunk/MagicSoft/Mars/mtemp/mifae/Changelog	(revision 4428)
@@ -19,4 +19,8 @@
                                                  -*-*- END OF LINE -*-*-
 
+  2004/07/28 Ester Aliu Fuste
+    * programa/makeHillas.cc
+     - Add a flag for the time calibration
+ 
   2004/07/26 Ester Aliu Fuste
     * library/MIslandCalc.cc
Index: trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc	(revision 4427)
+++ trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc	(revision 4428)
@@ -84,4 +84,5 @@
 ULong_t  nmaxevents= 999999999;
 Short_t  calflag   = 1;
+Bool_t  caltimeflag   = kFALSE;
 Short_t  cleanflag   = 1;
 UShort_t  lrings     = 1;
@@ -135,10 +136,10 @@
 {
   // Set the general tasks/containers
-  MExtractFixedWindow    extractor;
+  //MExtractFixedWindow    extractor;
+  //extractor.SetRange(hifirst,hilast,lofirst,lolast);
+ 
+  MExtractSlidingWindow    extractor;
   extractor.SetRange(hifirst,hilast,lofirst,lolast);
- 
-  //  MExtractSlidingWindow    extractor;
-  //  extractor.SetRange(hifirst,hilast,lofirst,lolast);
-  //  extractor.SetWindowSize(4,4);
+  extractor.SetWindowSize(4,4);
   
   MGeomCamMagic       geomcam;
@@ -169,4 +170,5 @@
   MJCalibration calloop;
 
+  calloop.SetRelTimeCalibration(caltimeflag);
   calloop.SetExtractor(&extractor);
   calloop.SetInput(&caliter);
@@ -507,4 +509,7 @@
 	ifun >> calflag;
 
+      // calibration flag
+      if(strcmp(word.Data(),"CALTIME")==0)
+	ifun >> caltimeflag;
 
       // cleaning level
Index: trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard	(revision 4427)
+++ trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard	(revision 4428)
@@ -49,12 +49,18 @@
 CALFLAG 0
 
+// calibration time:
+//   0: kFALSE (no time calibration)
+//   1: kTRUE  (time calibration)
+//CALTIME 1
+
+
 // Cleaning level (tail cut, boundary cut, number of rings, cleaning method - 1=standard, 2=democratic)
 CLEANLEVEL 3.0 1.5 1 1
 
 //Island calculations
-// 0  nothing about islands 
-// 1  islands w/o cleaning
+// 0  nothing about islands    1:normal algorithm 
+// 1  islands w/o cleaning     2:alternative algorithm
 // 2  islands  w  cleaning
-ISLFLAG 0
+ISLFLAG 0 1
 
 // island cleaning: