Changeset 7005 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/10/05 12:13:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (1 diff)
• MJCalibrateSignal.cc (modified) (2 diffs)
• MJCalibration.cc (modified) (1 diff)
• MJCut.cc (modified) (2 diffs)
• MJPedestal.cc (modified) (1 diff)
• MJSpectrum.cc (modified) (3 diffs)
• MJStar.cc (modified) (2 diffs)
• hilocalib_df46_mc.root (modified) ( previous)
• hilocalib_sp1.root (modified) ( previous)
• hilocalib_sp1_mc.root (modified) ( previous)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -390 +390 @@
 
   // Check for interleaved events
+  // This will make that for data with version less than 5, where trigger
+  // patterns were not yet correct, all the events in the file will be
+  // processed. For those data there are no interleaved calibration events,
+  // so it makes no sense to run this test on a _D_ file. So we assume it
+  // will be a _C_ file, and accept all events.
   MTriggerPatternDecode decode;
   MFTriggerPattern      fcalib;
   fcalib.DenyCalibration();
+  fcalib.SetDefault(kFALSE);
   MContinue conttp(&fcalib, "ContTrigPattern");
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -460 +460 @@
     MTriggerPatternDecode     decode;
 
+    // This will make that for data with version less than 5, where
+    // trigger patterns were not yet correct, all the events in the real
+    // data file will be processed. In any case there are no interleaved
+    // calibration events in such data, so this is fine.
     MFTriggerPattern ftp;
     ftp.SetDefault(kTRUE);
@@ -467 +471 @@
     //    ftp.DenyPinDiode();
     ftp.SetInverted();
+
+    // This will skip interleaved calibration events and pedestal events (if any)
+    // --> tlist2
     MContinue conttp(&ftp, "ContTrigPattern");
-    // --> tlist2
 
     // Do signal and pedestal calculation

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1799 +1799 @@
     // Other Tasks
     //
+
+    // Set the default for data version earlier than 5, where no valid
+    // trigger pattern exists. There should not be pin diode or other
+    // types of events inside the calibration files which should be skipped,
+    // anyway. So we set the default such that the MContinue ccalib
+    // will never be executed.
     MTriggerPatternDecode     trgpat;
     MFTriggerPattern          fcalib("CalibFilter");

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -77 +77 @@
 MJCut::MJCut(const char *name, const char *title)
     : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE),
-    fIsWobble(kFALSE), fIsMonteCarlo(kFALSE),  fFullDisplay(kFALSE),
+    fIsWobble(kFALSE), fIsMonteCarlo(kFALSE),  fFullDisplay(kTRUE),
     fNameHist("MHThetaSq"), fCalcHadronness(0)
 {
@@ -334 +334 @@
     write->AddContainer("MHadronness",    "Events", kFALSE);
     write->AddContainer("MEnergyEst",     "Events", kFALSE);
+    write->AddContainer("ThetaSquared",   "Events", kFALSE);
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -940 +940 @@
     }
 
+    // This will make that for data with version less than 5, where
+    // trigger patterns were not yet correct, all the events in the real
+    // data file will be processed. In any case there are no interleaved
+    // calibration events in such data, so this is fine.
     MFTriggerPattern fcalib("CalibFilter");
+    fcalib.SetDefault(kFALSE);
     fcalib.RequireCalibration();
     fcalib.SetInverted();

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -178 +178 @@
         return -1;
 
-    TObject *hist = arr.FindObjectInCanvas("Hist", "MHAlpha", "Hist");
-    cout << "HIST: " << hist << endl;
-    if (hist)
-        cout << "TYPE: " << hist->ClassName() << endl;
-    arr.Print();
-
     vstime->Copy(h1);
     size->Copy(h2);
@@ -335 +329 @@
 Bool_t MJSpectrum::Refill(MParList &plist, TH1D &h2) const
 {
+    // Try to find the class used to determin the signal!
+    TString cls("MHAlpha");
+    if (fDisplay)
+    {
+        TCanvas *c = fDisplay->GetCanvas("Hist");
+        if (c)
+        {
+            TIter Next(c->GetListOfPrimitives());
+            TObject *obj=0;
+            while ((obj=Next()))
+                if (obj->InheritsFrom(MHAlpha::Class()))
+                    break;
+            if (obj)
+                cls = obj->ClassName();
+        }
+    }
+
+    cout << "FOUND: "<< cls << endl;
+
+    // Now fill the histogram
     *fLog << endl;
     fLog->Separator("Refill Excess");
@@ -350 +364 @@
     taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
-    MFillH fill1("HistEOff [MHAlpha]", "MHillasSrc", "FillHistEOff");
-    MFillH fill2("HistE    [MHAlpha]", "MHillasSrc", "FillHistE");
+    MFillH fill1(Form("HistEOff [%s]", cls.Data()), "", "FillHistEOff");
+    MFillH fill2(Form("HistE    [%s]", cls.Data()), "", "FillHistE");
 
     MFDataMember f0("DataType.fVal", '<', 0.5, "FilterOffData");

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -325 +325 @@
         write.AddContainer("MMcConfigRunHeader",   "RunHeaders");
         write.AddContainer("MMcCorsikaRunHeader",  "RunHeaders");
-        write.AddCopySource("OriginalMC");
     }
     else
@@ -354 +353 @@
         writem.AddContainer("MMcTrig",    "Muons");
     }
+
+    if (ismc)
+        if (fMuonAnalysis)
+            writem.AddCopySource("OriginalMC");
+        else
+            write.AddCopySource("OriginalMC");
 
     MTaskList tlist2("Events");