Changeset 4225 for trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

Timestamp:

05/27/04 18:02:18 (20 years ago)

Author:

rico

Message:

*** empty log message ***

File:

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

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

@@ -10 +10 @@
 #include "MPedestalCam.h"
 #include "MBadPixelsCam.h"
+#include "MBadPixelsTreat.h"
 #include "MReadMarsFile.h"
 #include "MGeomApply.h"
@@ -130 +131 @@
   extractor.SetRange(hifirst,hilast,lofirst,lolast);
 
-  //  MCalibrationQECam   qecam;
-  //  MBadPixelsCam       badcam;
   MGeomCamMagic       geomcam;
   MGeomApply          geomapl;
@@ -159 +158 @@
   calloop.SetExtractor(&extractor);
   calloop.SetInput(&caliter);
-  //  calloop.SetQECam(qecam);
   calloop.SetBadPixels(pedloop.GetBadPixels());
 
@@ -184 +182 @@
   plist3.AddToList(&calloop.GetQECam());
   plist3.AddToList(&calloop.GetRelTimeCam());
-  //  plist3.AddToList(&badcam);
+  plist3.AddToList(&calloop.GetBadPixels());
   plist3.AddToList(&sigcam);
   plist3.AddToList(&nphot);
@@ -201 +199 @@
   read3.DisableAutoScheme();
  
-  //  MExtractSignal  extsig;
-  //  extsig.SetRange(hifirst,hilast,lofirst,lolast);
   MCalibrate      photcalc(calMode);
   MPedPhotCalc    photrmscalc; 
@@ -258 +254 @@
   plist4.AddToList(&calloop.GetQECam());
   plist4.AddToList(&calloop.GetRelTimeCam());
-  //  plist4.AddToList(&badcam);
+  plist4.AddToList(&calloop.GetBadPixels());
   plist4.AddToList(&nphot);
   plist4.AddToList(&nphotrms);
@@ -274 +270 @@
   read4.DisableAutoScheme();
   
-  // set bad pixels 
-  MBlindPixelCalc   blind;
-  MBlindPixelCalc   blind2;
-  const Short_t x[16] = {330,395,329,396,389,
-                         323,388,322,384,385,
-                         386,387,321,320,319,
-                         394};
-  const TArrayS bp(16,(Short_t*)x);
-  blind.SetPixelIndices(bp);
-  blind2.SetPixelIndices(bp);
-  
   MImgCleanStd      clean(lcore,ltail);
 
@@ -291 +276 @@
   MIslandCalc       island;
   island.SetOutputName("MIslands1");
+
+  MBadPixelsTreat   interpolatebadpixels;
+  interpolatebadpixels.SetUseInterpolation();
 
   MIslandClean      islclean(lnew);
@@ -331 +319 @@
       if (islflag == 2)
         disphillas->SetIslandsName("MIslands2");
-
     }      
 
@@ -338 +325 @@
   tlist4.AddToList(&extractor);
   tlist4.AddToList(&photcalc);
-  //tlist4.AddToList(&blind);
+  if(calflag==11)
+    tlist4.AddToList(&interpolatebadpixels);
   tlist4.AddToList(&clean);
 
@@ -523 +511 @@
   if(display)
     cout << "Generating PS file: " << psfilename << endl;
-  cout << "Calibration flag: " << calflag << endl;
+  cout << "Calibration: ";
+  if(calflag==0)    
+    cout << "Pixel area proportional intercalibration" << endl;
+  else if(calflag==-1)    
+    cout << "No calibration whatsoever" << endl;
+  else if(calflag==1)
+    cout << "Default calibration" << endl;
+  else if(calflag==11)
+    cout << "Default calibration + bad pixels interpolation" << endl;
   cout << "Cleaning level: ("<<lcore<<","<<ltail<<")" << endl;
   if (islflag == 1 || islflag == 2)