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

Timestamp:

06/22/04 20:49:26 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/programs

Files:

• Makefile (modified) (2 diffs)
• makeHillas.cc (modified) (11 diffs)
• optimizeCuts.cc (modified) (2 diffs)
• psffit.cc (modified) (4 diffs)
• srcPos.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/programs/Makefile

@@ -28 +28 @@
            -I../../../mfbase \
            -I../../../mjobs \
-           -I../../../mpedestal \
+           -I../../../mpedestal  \
            -I../../../mbadpixels \
            -I../../../mfileio \
@@ -42 +42 @@
            -I../../../mpointing \
            -I../../../mcamera \
+           -I../../../mhist \
            -I../../../mastro
 

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

@@ -22 +22 @@
 #include "MExtractor.h"
 #include "MExtractFixedWindow.h"
+#include "MExtractSlidingWindow.h"
 #include "MExtractSignal.h"
 #include "MCalibrationChargeCalc.h"
@@ -122 +123 @@
       return -1;
     }
+
   makeHillas();
 }
@@ -131 +133 @@
   MExtractFixedWindow    extractor;
   extractor.SetRange(hifirst,hilast,lofirst,lolast);
-
+ 
+  //  MExtractSlidingWindow    extractor;
+  // extractor.SetRange(hifirst,hilast,lofirst,lolast);
+  // extractor.SetWindowSize(2,2);
+  
   MGeomCamMagic       geomcam;
   MGeomApply          geomapl;
@@ -232 +238 @@
 
   MArrivalTimeCam   timecam;
-     
+
+
+  // islands
   MIslands      isl;
-  isl.SetName("MIslands1");
-  
   MIslands      isl2;
+  MIslands      isl3;
+
+  isl.SetName("MIslands");  
   isl2.SetName("MIslands2");
-
-  MIslands      isl3;
   isl3.SetName("MIslands3");
 
-  if (islflag == 1 || islflag == 2 || islflag == 3)
-    {
-      plist4.AddToList(&timecam);
-      plist4.AddToList(&isl);
-    }
+  plist4.AddToList(&timecam);
+  plist4.AddToList(&isl);
   
   if (islflag == 2)
-    {
-      plist4.AddToList(&isl2);
-    }
-
+    plist4.AddToList(&isl2);
   if (islflag == 3)
-    {
-      plist4.AddToList(&isl3);
-    }
+    plist4.AddToList(&isl3);
   
   plist4.AddToList(&geomcam);
@@ -280 +279 @@
   
   MImgCleanStd      clean(lcore,ltail);
-
   MArrivalTimeCalc2 timecalc;
-  
   MIslandCalc       island;
-  island.SetOutputName("MIslands1");
+  island.SetOutputName("MIslands");
   island.SetAlgorithm(kalgorithm);
 
@@ -291 +288 @@
 
   MIslandClean      islclean(lnew);
-  islclean.SetInputName("MIslands1");
+  islclean.SetInputName("MIslands");
   islclean.SetMethod(kmethod);
       
@@ -307 +304 @@
   MContinue applycut(&cut);
   applycut.SetInverted(kTRUE);
-  MWriteRootFile* write=NULL;
+  MWriteRootFile write(outname,"RECREATE");
+  
   MHillasDisplay*  disphillas=NULL;
 
-  write = new MWriteRootFile(outname,"RECREATE");
-  
-  write->AddContainer("MHillas"        , "Parameters");
-  write->AddContainer("MHillasSrc"     , "Parameters");
-  write->AddContainer("MHillasExt"     , "Parameters");
-  write->AddContainer("MNewImagePar"   , "Parameters");
-  write->AddContainer("MRawEvtHeader"  , "Parameters");
-  write->AddContainer("MRawRunHeader"  , "Parameters");
-  write->AddContainer("MConcentration" , "Parameters");
-  write->AddContainer("MSrcPosCam"     , "Parameters");
-  
-  if (islflag == 1 || islflag == 2 || islflag == 3)
-    write->AddContainer("MIslands1" , "Parameters");
+  write.AddContainer("MHillas"        , "Parameters");
+  write.AddContainer("MHillasSrc"     , "Parameters");
+  write.AddContainer("MHillasExt"     , "Parameters");
+  write.AddContainer("MNewImagePar"   , "Parameters");
+  write.AddContainer("MRawEvtHeader"  , "Parameters");
+  write.AddContainer("MRawRunHeader"  , "Parameters");
+  write.AddContainer("MConcentration" , "Parameters");
+  write.AddContainer("MSrcPosCam"     , "Parameters");
+  write.AddContainer("MIslands" , "Parameters");
+
   if (islflag == 2) 
-    write->AddContainer("MIslands2" , "Parameters");
+    write.AddContainer("MIslands2" , "Parameters");
   if (islflag == 3) 
-    write->AddContainer("MIslands3" , "Parameters");
+    write.AddContainer("MIslands3" , "Parameters");
 
 
@@ -332 +327 @@
     {
       disphillas = new MHillasDisplay(&nphot,&geomcam);
-      if (islflag == 1)
-        disphillas->SetIslandsName("MIslands1");
+      disphillas->SetIslandsName("MIslands");
       if (islflag == 2)
         disphillas->SetIslandsName("MIslands2");
@@ -347 +341 @@
     tlist4.AddToList(&interpolatebadpixels);
   tlist4.AddToList(&clean);
-
-  if (islflag == 1 || islflag == 2 || islflag == 3)
-    {
-      tlist4.AddToList(&timecalc);
-      tlist4.AddToList(&island);
-    }
+  tlist4.AddToList(&timecalc);
+  tlist4.AddToList(&island);
 
   if (islflag == 2)
@@ -366 +356 @@
     }
   
-
-  //tlist4.AddToList(&blind2);
   tlist4.AddToList(&hcalc);
   tlist4.AddToList(&csrc1);
   if(filter.Length())
     tlist4.AddToList(&applycut);
-  tlist4.AddToList(write);
+  tlist4.AddToList(&write);
   if(display)
     {
@@ -381 +369 @@
       tlist4.AddToList(disphillas);
     }
-
 
   // Create and setup the eventloop

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

@@ -113 +113 @@
   ton->SetAlias("length","MHillas.fLength*0.6/189");
   ton->SetAlias("width","MHillas.fWidth*0.6/189");
+  //  ton->SetAlias("length","MHillas.fLength");
+  //  ton->SetAlias("width","MHillas.fWidth");
   ton->SetAlias("dist","MHillasSrc.fDist*0.6/189");
   ton->SetAlias("conc","MNewImagePar.fConc");
@@ -121 +123 @@
   toff->SetAlias("length","MHillas.fLength*0.6/189");
   toff->SetAlias("width","MHillas.fWidth*0.6/189");
+  //toff->SetAlias("length","MHillas.fLength");
+  //toff->SetAlias("width","MHillas.fWidth");
   toff->SetAlias("dist","MHillasSrc.fDist*0.6/189");
   toff->SetAlias("conc","MNewImagePar.fConc");

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

@@ -39 +39 @@
 #include "MPSFFitCalc.h"
 #include "MEvtLoop.h"
+#include "MCalibrateDC.h"
 
 using namespace std;
@@ -104 +105 @@
   MGeomApply geomapl;
 
+  TString continuoslightfile = 
+    "/nfs/magic/CaCodata/rootdata/Miscellaneous/Period016/2004_04_16/dc_2004_04_16_04_46_18_22368_Off3c279-2CL100.root";
+  MCalibrateDC dccal;
+  dccal.SetFileName(continuoslightfile);
+ 
   const Int_t numrings = 3;
-  const Int_t numblind = 23;
-  const Short_t x[numblind] = {  8,  27, 224, 279, 339,
-                               507, 508, 509, 510, 511, 512, 513, 514,
-                               543,
-                               559, 560, 561, 562, 563, 564, 565, 566, 567};
+  //  const Int_t numblind = 187;
+
 
   // 2004_02_15
@@ -118 +121 @@
                                523, 524, 525, 526, 527, 528, 529, 530, 531};
   */
+  const Int_t numblind = 260;
+  Short_t x[numblind];
+
+  for (int i=0;i<246;i++)
+    x[i+14]=i+331;
+  x[0]=124;
+  x[1]=123;
+  x[2]=125;
+  x[3]=166;
+  x[4]=165;
+  x[5]=88;
+  x[6]=89;
+  x[7]=282;
+  x[8]=283;
+  x[9]=226;
+  x[10]=227;
+  x[11]=228;
+  x[12]=177;
+  x[13]=178;
+
   const TArrayS blindpixels(numblind,(Short_t*)x);
   MPSFFitCalc psfcalc;
@@ -128 +151 @@
   tlist.AddToList(&geomapl);
   tlist.AddToList(&read);
+  tlist.AddToList(&dccal, "Currents");
   tlist.AddToList(&psfcalc, "Currents");
 

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

@@ -31 +31 @@
 #include "MWriteRootFile.h"
 #include "MTime.h"
+#include "MControlPlots.h"
+#include "MIslands.h"
 
 using namespace std;
@@ -54 +56 @@
 Double_t fDEC= -1.;
 TString  srcFile;
+TString  controlplotsfilename="controlplots.ps";
 
 //-----------------------------------------------------------------------------
@@ -107 +110 @@
   MParList  plist;  
   MTaskList tlist;
+  MIslands  islands;
 
   // include containers in parameter list
   plist.AddToList(&tlist);
+  plist.AddToList(&islands);
                   
   // tasks
@@ -144 +149 @@
   write.AddContainer("MConcentration" , "Parameters");
   write.AddContainer("MSrcPosCam"     , "Parameters");
-
+  write.AddContainer("MIslands"       , "Parameters");
+  //write.AddContainer("MIslands2"     ,  "Parameters");
+
+  MControlPlots controlplots(controlplotsfilename);
+  controlplots.SetProduceFile(kFALSE);
+  
   // include tasks in task list
   tlist.AddToList(&read);
@@ -156 +166 @@
     }
   tlist.AddToList(&csrc1);  
+  tlist.AddToList(&controlplots);
   tlist.AddToList(&write);
 
@@ -184 +195 @@
   write2.AddContainer("MConcentration" , "Parameters");
   write2.AddContainer("MSrcPosCam"     , "Parameters");
+  write2.AddContainer("MIslands"       , "Parameters");
+  // write2.AddContainer("MIslands2"     ,  "Parameters");
   tlist.AddToListBefore(&write2,&write,"All");
   tlist.RemoveFromList(&write);
@@ -191 +204 @@
   else
     srcrotate.SetMode(MSrcPlace::kOff);
+
+  controlplots.SetMode(MControlPlots::kOff);
+  controlplots.SetProduceFile(kTRUE);
 
   if (!evtloop.Eventloop(nmaxevents))