Changeset 6994 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/04/05 16:53:10 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (1 diff)
• MJStar.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -321 +321 @@
     if (theta)
     {
-        proj.Scale(theta->Integral()/proj.Integral());
+        proj.Scale(theta->GetMaximum()/proj.GetMaximum());
         theta->SetMaximum(1.05*TMath::Max(theta->GetMaximum(), proj.GetMaximum()));
     }

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -54 +54 @@
 #include "MReadMarsFile.h"
 #include "MF.h"
+#include "MFDataMember.h"
 #include "MFDeltaT.h"
 #include "MFSoftwareTrigger.h"
@@ -286 +287 @@
     // ------------------ Setup write task ----------------
 
-    MWriteRootFile write(2, Form("%s{s/_Y_/_I_}", fPathOut.Data()), fOverwrite?"RECREATE":"NEW");
+    const TString rule(Form("%s{s/_Y_/_I_}", fPathOut.Data()));
+    MWriteRootFile write( 2, rule, fOverwrite?"RECREATE":"NEW");
+    MWriteRootFile writem(2, rule, fOverwrite?"RECREATE":"NEW");
     // Data
     write.AddContainer("MHillas",       "Events");
@@ -305 +308 @@
 
     // Muon Setup
-    write.AddContainer("BinningRadius",          "RunHeaders");
-    write.AddContainer("BinningArcWidth",        "RunHeaders");
-    write.AddContainer("BinningRingBroadening",  "RunHeaders");
-    write.AddContainer("BinningSizeVsArcRadius", "RunHeaders");
-    write.AddContainer("MMuonSetup",             "RunHeaders");
+    write.AddContainer("BinningRadius",            "RunHeaders");
+    write.AddContainer("BinningArcWidth",          "RunHeaders");
+    write.AddContainer("BinningRingBroadening",    "RunHeaders");
+    write.AddContainer("BinningSizeVsArcRadius",   "RunHeaders");
+    write.AddContainer("MMuonSetup",               "RunHeaders");
 
     if (ismc)
@@ -333 +336 @@
         write.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
         write.AddContainer("MTimeEffectiveOnTime", "EffectiveOnTime");
+    }
+
+    // What to write in muon tree
+    writem.AddContainer("MMuonSearchPar", "Muons");
+    writem.AddContainer("MMuonCalibPar",  "Muons");
+    writem.AddContainer("MHillas",        "Muons");
+    writem.AddContainer("MHillasExt",     "Muons");
+    writem.AddContainer("MHillasSrc",     "Muons");
+    writem.AddContainer("MImagePar",      "Muons");
+    writem.AddContainer("MNewImagePar",   "Muons");
+    writem.AddContainer("MRawEvtHeader",  "Muons");
+    writem.AddContainer("MPointingPos",   "Muons");
+    if (ismc)
+    {
+        // Monte Carlo Data
+        writem.AddContainer("MMcEvt",     "Muons");
+        writem.AddContainer("MMcTrig",    "Muons");
     }
 
@@ -369 +389 @@
     MF fmuon3("(MMuonCalibPar.fArcPhi>175)  && (MMuonSearchPar.fDeviation<37)",
               "MuonFinalCut");
+    MFDataMember fmuon4("MMuonCalibPar.fArcPhi", '>', -0.5, "MuonWriteCut");
+    writem.SetFilter(&fmuon4);
 
     MMuonSearchParCalc muscalc;
@@ -390 +412 @@
         tlist2.AddToList(&fmuon3);
         tlist2.AddToList(&fillmpar);
+        tlist2.AddToList(&fmuon4);
+        tlist2.AddToList(&writem);
     }
     // ------------------------------------------------------------