Changeset 4428 for trunk/MagicSoft/Mars/mtemp/mifae/programs

Timestamp:

07/28/04 10:56:38 (20 years ago)

Author:

aliu

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/programs

Files:

• makeHillas.cc (modified) (4 diffs)
• makehillas.datacard (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -84 +84 @@
 ULong_t  nmaxevents= 999999999;
 Short_t  calflag   = 1;
+Bool_t  caltimeflag   = kFALSE;
 Short_t  cleanflag   = 1;
 UShort_t  lrings     = 1;
@@ -135 +136 @@
 {
   // 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 +170 @@
   MJCalibration calloop;
 
+  calloop.SetRelTimeCalibration(caltimeflag);
   calloop.SetExtractor(&extractor);
   calloop.SetInput(&caliter);
@@ -507 +509 @@
         ifun >> calflag;
 
+      // calibration flag
+      if(strcmp(word.Data(),"CALTIME")==0)
+        ifun >> caltimeflag;
 
       // cleaning level

trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard

@@ -49 +49 @@
 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: