Changeset 2622 for trunk/MagicSoft

Timestamp:

12/08/03 11:42:07 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• star.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -8 +8 @@
    * mraw/MRawFileRead.cc:
      - implemented an artificial time-stamp for the current data
+
+   * star.cc, macros/star.C:
+     - works now with MC files and real data.
 
 

trunk/MagicSoft/Mars/star.cc

@@ -17 +17 @@
 #include "MMcPedestalNSBAdd.h"
 #include "MCerPhotCalc.h"
+#include "MCerPhotAnal2.h"
 #include "MBlindPixelCalc.h"
 #include "MSigmabarCalc.h"
@@ -23 +24 @@
 #include "MHillasSrcCalc.h"
 #include "MWriteRootFile.h"
+#include "MFDataMember.h"
+#include "MFillH.h"
+#include "MPointingPosCalc.h"
+#include "MReportDrive.h"    // PRELIMINARY:
+#include "MPointingPos.h"    // PRELIMINARY:
 
 using namespace std;
@@ -146 +152 @@
     plist.AddToList(&tlist);
 
+    // PRELIMINARY:
+    /*
+     MReportDrive rep;
+     plist.AddToList(&rep);
+     MPointingPos pos;
+     plist.AddToList(&pos);
+     */
+
     //
     // Now setup the tasks and tasklist:
@@ -156 +170 @@
     MMcPedestalCopy   pcopy;
     MMcPedestalNSBAdd pnsb;
+
+    //MPointingPosCalc  pcalc;
+
     MCerPhotCalc      ncalc;
+    MCerPhotAnal2     nanal;
+
+    MFDataMember f1("MRawRunHeader.fRunType", '>', 255.5);
+    MFDataMember f2("MRawRunHeader.fRunType", '<', 255.5);
+
+    ncalc.SetFilter(&f1);
+    nanal.SetFilter(&f2);
+
     MBlindPixelCalc   blind;
     MSigmabarCalc     sgcal;
+    //MFillH            fills("MHSigmaTheta",  "", "FillSigmaTheta");
+    //MFillH            fillb("MHBlindPixels", "", "FillBlindPixels");
     MImgCleanStd      clean;
     MHillasCalc       hcalc;
@@ -165 +192 @@
 
     tlist.AddToList(&read);
+    tlist.AddToList(&f1);
+    tlist.AddToList(&f2);
     tlist.AddToList(&apply);
     tlist.AddToList(&pcopy);
     tlist.AddToList(&pnsb);
+    //tlist.AddToList(&pcalc);
     tlist.AddToList(&ncalc);
+    tlist.AddToList(&nanal);
     tlist.AddToList(&blind);
     tlist.AddToList(&sgcal);
+    //tlist.AddToList(&fills);
+    //tlist.AddToList(&fillb);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
@@ -186 +219 @@
     blind.SetUseInterpolation();
 
-    write.AddContainer(write.AddSerialNumber("MMcEvt"),       "Events");
+    write.AddContainer(write.AddSerialNumber("MMcEvt"),       "Events", kFALSE);
     write.AddContainer(write.AddSerialNumber("MSigmabar"),    "Events");
     write.AddContainer(write.AddSerialNumber("MHillas"),      "Events");
@@ -193 +226 @@
     write.AddContainer(write.AddSerialNumber("MNewImagePar"), "Events");
     write.AddContainer(write.AddSerialNumber("MSrcPosCam"),   "RunHeaders");
+    //write.AddContainer(write.AddSerialNumber("MHSigmaTheta"), "RunHeaders");
     if (!kUpdate)
     {
         write.AddContainer("MRawRunHeader", "RunHeaders");
-        write.AddContainer("MMcRunHeader",  "RunHeaders");
+        write.AddContainer("MMcRunHeader",  "RunHeaders", kFALSE);
     }
 
@@ -214 +248 @@
     }
 
-    // tlist.PrintStatistics();
+    tlist.PrintStatistics();
+
+    //plist.FindObject("MHSigmaTheta")->Write();
+    //plist.FindObject("MHBlindPixels")->Write();
 
     gLog << all << "Star finished successfull!" << endl;