Changeset 4014 for trunk

Timestamp:

05/07/04 18:49:24 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJExtractCalibTest.cc (modified) (13 diffs)
• mjobs/MJExtractCalibTest.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
  2004/05/07: Markus Gaug
+  
+   * mjobs/MExtractCalibTest.cc
+     - include write-out of the containers in the loop
 
    * mjobs/MJCalibration.cc

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

@@ -148 +148 @@
 }
 
-TString MJExtractCalibTest::GetOutputFileD() const
+TString MJExtractCalibTest::GetOutputFile() const
 {
   if (!fRuns)
     return "";
   
-  return Form("%s/%s-F3.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
-}
-
-TString MJExtractCalibTest::GetOutputFileT() const
-{
-  if (!fRuns)
-    return "";
-  
-  return Form("%s/%s-F4.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
-}
-
-TString MJExtractCalibTest::GetOutputFileP() const
-{
-  if (!fRuns)
-    return "";
-
-  return Form("%s/%s-F2.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
-}
+  return Form("%s/%s-Test.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
+}
+
 
 Bool_t MJExtractCalibTest::ProcessD(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam)
 {
-  const TString fname = GetOutputFileD();
+  const TString fname = GetOutputFile();
   
   if (gSystem->AccessPathName(fname, kFileExists))
@@ -200 +185 @@
   *fLog << endl;
   
-  MCerPhotEvt          cerphot;
-
+  MCerPhotEvt    cerphot;
+  MPedPhotCam    pedphot;
   // Setup Lists
   MParList plist;
@@ -208 +193 @@
   plist.AddToList(&qecam);
   plist.AddToList(&cerphot);
+  plist.AddToList(&pedphot);
   plist.AddToList(&fTestCam);
   plist.AddToList(&fBadPixels);
-  
+
   MTaskList tlist;
   plist.AddToList(&tlist);
@@ -223 +209 @@
   MCalibrate            photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
+  MPedPhotCalc    pedphotcalc;  
 
   MHCamEvent evt("ExtSignal");
@@ -231 +218 @@
   fillcam.SetNameTab("Test");
 
-  /*
-  MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
-  write.AddContainer("MExtractedSignalCam", "Events");
-  write.AddContainer("MTime",               "Events");
-  write.AddContainer("MRawEvtHeader",       "Events");
-  write.AddContainer("MPedestalCam",        "RunHeaders");
-  write.AddContainer("MRawRunHeader",       "RunHeaders");
-  write.AddContainer("MBadPixelsCam",       "RunHeaders");
-  */
 
   tlist.AddToList(&read);
@@ -254 +232 @@
 
   //  if (TestBit(kEnableGraphicalOutput))
-    tlist.AddToList(&fill);
+  tlist.AddToList(&fill);
   tlist.AddToList(&photcalc);
+  tlist.AddToList(&pedphotcalc);
   tlist.AddToList(&fillcam);
   
+  MWriteRootFile write(GetOutputFile(),    "RECREATE", fRuns->GetRunsAsString(), 2);
+  write.AddContainer(&pedcam               , "RunHeaders" );
+  write.AddContainer(&pedphot              , "RunHeaders" );
+  write.AddContainer(&calcam               , "Events"     );
+  write.AddContainer(&qecam                , "Events"     );
+  write.AddContainer(&fBadPixels           , "RunHeaders" );
+  write.AddContainer("MHCalibrationTestCam", "Events"     );
+  //  write.AddContainer(&testtime );
+  tlist.AddToList(&write);
+
   // Create and setup the eventloop
   MEvtLoop evtloop(fName);
@@ -282 +271 @@
 Bool_t MJExtractCalibTest::ProcessT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam)
 {
-  const TString fname = GetOutputFileT();
+  const TString fname = GetOutputFile();
   
   if (gSystem->AccessPathName(fname, kFileExists))
@@ -313 +302 @@
   // Setup Lists
   MParList plist;
-  plist.AddToList(&pedcam);
   plist.AddToList(&relcam);
   plist.AddToList(&arrtime);
-  plist.AddToList(&fTestCam);
+  plist.AddToList(&fTestTimeCam);
   plist.AddToList(&fBadPixels);
   
@@ -338 +326 @@
   fillcam.SetNameTab("TestTime");
 
-  /*
-  MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
-  write.AddContainer("MExtractedSignalCam", "Events");
-  write.AddContainer("MTime",               "Events");
-  write.AddContainer("MRawEvtHeader",       "Events");
-  write.AddContainer("MPedestalCam",        "RunHeaders");
-  write.AddContainer("MRawRunHeader",       "RunHeaders");
-  write.AddContainer("MBadPixelsCam",       "RunHeaders");
-  */
-
   tlist.AddToList(&read);
   tlist.AddToList(&apply);
@@ -356 +334 @@
     {
       *fLog << warn << GetDescriptor() 
-            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+            << ": No extractor has been chosen, take default MExtractTimeFastSpline " << endl;
       tlist.AddToList(&extract);
     }
@@ -365 +343 @@
   tlist.AddToList(&fillcam);
   
+  MWriteRootFile write(GetOutputFile(), "UPDATE", fRuns->GetRunsAsString(), 2);
+  write.AddContainer(&relcam                   , "Events"     );
+  write.AddContainer(&fBadPixels               , "RunHeaders" );
+  write.AddContainer("MHCalibrationTestCam"    , "Events"     );
+  write.AddContainer("MHCalibrationTestTimeCam", "Events"     );
+  write.AddContainer("MArrivalTimeCam"         , "Events"     );
+
   // Create and setup the eventloop
   MEvtLoop evtloop(fName);
@@ -390 +375 @@
 Bool_t MJExtractCalibTest::ReadPedPhotCam()
 {
-    const TString fname = GetOutputFileP();
+    const TString fname = GetOutputFile();
 
     if (gSystem->AccessPathName(fname, kFileExists))
@@ -424 +409 @@
 }
 
-Bool_t MJExtractCalibTest::ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam)
-{
-    if (!ReadPedPhotCam())
-        return ProcessFileP(pedcam, calcam, qecam);
-
-    return kTRUE;
-}
-
-Bool_t MJExtractCalibTest::ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam)
-{
-    if (!fRuns)
-    {
-        *fLog << err << "No Runs choosen... abort." << endl;
-        return kFALSE;
-    }
-    if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
-    {
-        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
-        return kFALSE;
-    }
-
-    *fLog << inf;
-    fLog->Separator(GetDescriptor());
-    *fLog << "Calculate MExtractedSignalCam from Runs " << fRuns->GetRunsAsString() << endl;
-    *fLog << endl;
-
-    MReadMarsFile read("Events");
-    read.DisableAutoScheme();
-    static_cast<MRead&>(read).AddFiles(*fRuns);
-
-    // Setup Tasklist
-    MParList plist;
-    plist.AddToList(&pedcam);
-    plist.AddToList(&calcam);
-    plist.AddToList(&fPedPhotCam);
-    plist.AddToList(&fBadPixels);
-
-    MTaskList tlist;
-    plist.AddToList(&tlist);
-
-    MGeomApply            apply; // Only necessary to craete geometry
-    MExtractSlidingWindow extract2;
-    MCalibrate            calib;
-    MPedPhotCalc          calc;
-
-    MHCamEvent evt1("ExtOffset");
-    MHCamEvent evt2("CalOffset");
-    evt1.SetType(0);
-    evt2.SetType(0);
-    MFillH fill1(&evt1, "MExtractedSignalCam", "FillExtractedSignal");
-    MFillH fill2(&evt2, "MCerPhotEvt",         "FillCerPhotEvt");
-
-    tlist.AddToList(&read);
-    tlist.AddToList(&apply);
-
-    if (fExtractor)
-      tlist.AddToList(fExtractor);
-    else
-      {
-      *fLog << warn << GetDescriptor() 
-            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
-      tlist.AddToList(&extract2);
-    }
-
-    if (TestBit(kEnableGraphicalOutput))
-        tlist.AddToList(&fill1);
-    tlist.AddToList(&calib);
-    tlist.AddToList(&calc);
-    if (TestBit(kEnableGraphicalOutput))
-        tlist.AddToList(&fill2);
-
-    // Create and setup the eventloop
-    MEvtLoop evtloop(fName);
-    evtloop.SetParList(&plist);
-    evtloop.SetDisplay(fDisplay);
-    evtloop.SetLogStream(fLog);
-
-    // Execute first analysis
-    if (!evtloop.Eventloop())
-    {
-        *fLog << err << GetDescriptor() << ": Failed." << endl;
-        return kFALSE;
-    }
-
-    tlist.PrintStatistics();
-
-    DisplayResult(plist);
-
-    *fLog << inf << GetDescriptor() << ": Done." << endl;
-
-    return kTRUE;
-}
 
 /*

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h

@@ -4 +4 @@
 #ifndef MARS_MHCalibrationTestCam
 #include "MHCalibrationTestCam.h"
+#endif
+#ifndef MARS_MHCalibrationTestTimeCam
+#include "MHCalibrationTestTimeCam.h"
 #endif
 #ifndef MARS_MPedPhotCam
@@ -33 +36 @@
   MExtractTime *fTimeExtractor;              // Arrival time extractor  
   
-  MBadPixelsCam        fBadPixels;
-  MHCalibrationTestCam fTestCam;
-  MPedPhotCam          fPedPhotCam;
+  MBadPixelsCam            fBadPixels;
+  MHCalibrationTestCam     fTestCam;
+  MHCalibrationTestTimeCam fTestTimeCam;
+  MPedPhotCam              fPedPhotCam;
 
   Bool_t ReadPedPhotCam();
@@ -51 +55 @@
   void SetOutputPath(const char *path=".");
   
-  TString GetOutputFileP() const;
-  TString GetOutputFileD() const;
-  TString GetOutputFileT() const;
+  TString GetOutputFile() const;
   
-  MHCalibrationTestCam &GetTestCam()    { return fTestCam; }
+  MHCalibrationTestCam     &GetTestCam()      { return fTestCam; }
+  MHCalibrationTestTimeCam &GetTestTimeCam()  { return fTestTimeCam; }  
   MPedPhotCam          &GetPedPhotCam() { return fPedPhotCam; }
   const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
@@ -64 +67 @@
   
   Bool_t ProcessD(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
-  Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
   Bool_t ProcessT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam);