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

Timestamp:

06/11/04 20:02:08 (21 years ago)

Author:

aliu

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc (modified) (12 diffs)

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

@@ -65 +65 @@
 
 // initial and final time slices to be used in signal extraction
-const Byte_t hifirst = 0;
-const Byte_t hilast  = 13;
+const Byte_t hifirst = 1;
+const Byte_t hilast  = 14;
 const Byte_t lofirst = 3;
-const Byte_t lolast  = 12;
+const Byte_t lolast  = 14;
 
 // declaration of variables read from datacards
@@ -86 +86 @@
 Float_t  lnew      = 40;
 Int_t    kmethod   = 1;
+Int_t    kalgorithm = 1;
 Int_t    nfiles    = 0;
 
@@ -238 +239 @@
   isl2.SetName("MIslands2");
 
-  if (islflag == 1 || islflag == 2)
+  MIslands      isl3;
+  isl3.SetName("MIslands3");
+
+  if (islflag == 1 || islflag == 2 || islflag == 3)
     {
       plist4.AddToList(&timecam);
@@ -247 +251 @@
     {
       plist4.AddToList(&isl2);
+    }
+
+  if (islflag == 3)
+    {
+      plist4.AddToList(&isl3);
     }
   
@@ -276 +285 @@
   MIslandCalc       island;
   island.SetOutputName("MIslands1");
+  island.SetAlgorithm(kalgorithm);
 
   MBadPixelsTreat   interpolatebadpixels;
@@ -286 +296 @@
   MIslandCalc       island2;
   island2.SetOutputName("MIslands2");  
+  island2.SetAlgorithm(kalgorithm);
+
+  MIslandCalc       island3;
+  island3.SetOutputName("MIslands3");  
   
   
@@ -307 +321 @@
   write->AddContainer("MSrcPosCam"     , "Parameters");
   
-  if (islflag == 1 || islflag == 2)
+  if (islflag == 1 || islflag == 2 || islflag == 3)
     write->AddContainer("MIslands1" , "Parameters");
   if (islflag == 2) 
     write->AddContainer("MIslands2" , "Parameters");
+  if (islflag == 3) 
+    write->AddContainer("MIslands3" , "Parameters");
+
 
   if(display)
@@ -319 +336 @@
       if (islflag == 2)
         disphillas->SetIslandsName("MIslands2");
+      if (islflag == 3)
+        disphillas->SetIslandsName("MIslands3");
     }      
 
@@ -329 +348 @@
   tlist4.AddToList(&clean);
 
-  if (islflag == 1 || islflag == 2)
+  if (islflag == 1 || islflag == 2 || islflag == 3)
     {
       tlist4.AddToList(&timecalc);
@@ -340 +359 @@
       tlist4.AddToList(&island2);
     }
-  
+
+  if (islflag == 3)
+    {
+      tlist4.AddToList(&islclean);
+      tlist4.AddToList(&island3);
+    }
+  
+
   //tlist4.AddToList(&blind2);
   tlist4.AddToList(&hcalc);
@@ -475 +501 @@
         {
           ifun >> islflag;
+
+          // if (islflag == 1 || islflag == 2)
+            ifun >> kalgorithm;
         }
 
@@ -522 +551 @@
   cout << "Cleaning level: ("<<lcore<<","<<ltail<<")" << endl;
   if (islflag == 1 || islflag == 2)
-    cout << "Island calcultation..." << endl;
+    cout << "Island calcultation..." << "using algorithm #" << kalgorithm <<endl;
   if (islflag == 2)
     {