Changeset 4392 for trunk

Timestamp:

07/15/04 16:48:46 (20 years ago)

Author:

blanch

Message:

*** empty log message ***

File:

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

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

@@ -73 +73 @@
 // declaration of variables read from datacards
 TString  outname;
+const TString outpath = "./";
 TString  idirname;
 TString  filter;
 TString  psfilename("makehillas.ps");
+MRunIter pedcaliter;
 MRunIter caliter;
 MRunIter pediter;
@@ -82 +84 @@
 ULong_t  nmaxevents= 999999999;
 Short_t  calflag   = 1;
+Short_t  cleanflag   = 1;
+UShort_t  lrings     = 1;
 Float_t  lcore     = 3.0;
 Float_t  ltail     = 1.5;
@@ -131 +135 @@
 {
   // 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(2,2);
+  extractor.SetWindowSize(4,4);
   
   MGeomCamMagic       geomcam;
@@ -149 +153 @@
   //badcam.AsciiRead("badpixels.dat");
 
-  MJPedestal pedloop;
-  pedloop.SetInput(&pediter);
-  pedloop.SetExtractor(&extractor);
+  MJPedestal pedcalloop;
+  pedcalloop.SetInput(&pediter);
+  pedcalloop.SetExtractor(&extractor);
   //  pedloop.SetBadPixels(badcam);
-
-  if (!pedloop.Process())
+  //pedcalloop.SetOutputPath(outpath.Data());
+
+
+  if (!pedcalloop.Process())
     return;
 
@@ -165 +171 @@
   calloop.SetExtractor(&extractor);
   calloop.SetInput(&caliter);
-  calloop.SetBadPixels(pedloop.GetBadPixels());
-
+  calloop.SetBadPixels(pedcalloop.GetBadPixels());
+  if(calflag==2)
+    calloop.SetUseBlindPixel();
   if(calflag>0)
-    if (!calloop.Process(pedloop.GetPedestalCam()))
+    if (!calloop.Process(pedcalloop.GetPedestalCam()))
       return;
 
@@ -175 +182 @@
   /*                THIRD LOOP: PEDESTAL CALIBRATION INTO PHOTONS         */
   /************************************************************************/
+  // First Compute the pedestals
+  MJPedestal pedloop;
+  pedloop.SetInput(&pediter);
+
+  if (!pedloop.Process())
+    return;
+
   MParList  plist3;
   MTaskList tlist3;
@@ -279 +293 @@
   
   MImgCleanStd      clean(lcore,ltail);
+  clean.SetCleanRings(lrings);
+  MImgCleanStd::CleaningMethod_t cleanMeth= MImgCleanStd::kStandard;  
+  if(cleanflag==2)
+    cleanMeth=MImgCleanStd::kDemocratic;
+  clean.SetMethod(cleanMeth);
+
   MArrivalTimeCalc2 timecalc;
   MIslandCalc       island;
@@ -338 +358 @@
   tlist4.AddToList(&extractor);
   tlist4.AddToList(&photcalc);
-  if(calflag==11)
+  if(calflag==11 || calflag==21)
     tlist4.AddToList(&interpolatebadpixels);
   tlist4.AddToList(&clean);
@@ -428 +448 @@
         }
 
+      // pedestal runs for calibration
+      if(strcmp(word.Data(),"PCRUNS")==0)
+        {
+          if(pedcaliter.GetNumRuns())
+            cout << "readDataCards Warning: adding pedestal runs for calibration to the existing list" << endl;
+          ifun >> word;
+          pedcaliter.AddRuns(word.Data(),idirname.Data());
+        }
+
       // calibration runs
       if(strcmp(word.Data(),"CRUNS")==0)
@@ -483 +512 @@
           ifun >> lcore;
           ifun >> ltail;
+          ifun >> lrings;
+          ifun >> cleanflag;
         }
 
@@ -536 +567 @@
   else if(calflag==11)
     cout << "Default calibration + bad pixels interpolation" << endl;
-  cout << "Cleaning level: ("<<lcore<<","<<ltail<<")" << endl;
+  cout << "Cleaning level: ("<<lcore<<","<<ltail<<") - " << lrings << "ring" << endl;
+  cout << "Cleaning methode: "<< cleanflag << endl;
   if (islflag == 1 || islflag == 2)
     cout << "Island calcultation..." << "using algorithm #" << kalgorithm <<endl;