Changeset 9482 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/29/09 15:15:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSimulation.cc (modified) (6 diffs)
• MJSpectrum.cc (modified) (2 diffs)
• MJStar.cc (modified) (5 diffs)
• MJob.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -74 +74 @@
 #include "MFillH.h"
 #include "MGeomApply.h"
+#include "MParameterCalc.h"
 #include "MHillasCalc.h"
 #include "MImgCleanStd.h"
@@ -166 +167 @@
     cont.Add(plist.FindObject("GeomCones"));
 
+    TNamed cmdline("CommandLine", fCommandLine.Data());
+    cont.Add(&cmdline);
+
     if (fDisplay)
     {
@@ -219 +223 @@
     hist.SetAutoRange();
 
-    TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
-    TString cos2 = "cos(MCorsikaEvtHeader.fZd)*cos(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
-    TString cos  = "cos(MCorsikaEvtHeader.fAz-MCorsikaRunHeader.fAzMin*TMath::DegToRad())";
-
-    TString form = "acos("+sin2+"*"+cos+"+"+cos2+")*TMath::RadToDeg()";
-
-    hist.AddHist(form);
+    hist.AddHist("IncidentAngle.fVal");
     hist.InitName("ViewCone");
     hist.InitTitle("Incident Angle;\\alpha [\\deg]");
@@ -243 +241 @@
     write.AddContainer("MRawEvtHeader",       "Events");
     write.AddContainer("MMcEvt",              "Events");
+    write.AddContainer("IncidentAngle",       "Events", kFALSE);
 }
 
@@ -372 +371 @@
     plist.AddToList(&splinemirror);
     plist.AddToList(&splinecones);
+
+    const TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
+    const TString cos2 = "cos(MCorsikaEvtHeader.fZd)*cos(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
+    const TString cos  = "cos(MCorsikaEvtHeader.fAz-MCorsikaRunHeader.fAzMin*TMath::DegToRad())";
+
+    const TString form = "acos("+sin2+"*"+cos+"+"+cos2+")*TMath::RadToDeg()";
+
+    MParameterCalc calcangle(form, "CalcIncidentAngle");
+    calcangle.SetNameParameter("IncidentAngle");
 
     MSimAtmosphere simatm;
@@ -637 +645 @@
         if (1)
             tasks.AddToList(&simatm); // Here because before fillh1
+        tasks.AddToList(&calcangle);
         tasks.AddToList(&fillh1);
         tasks.AddToList(&fillG);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1963 +1963 @@
     {
         TNamed ganame("ganymed.root", fPathIn.Data());
+        TNamed cmdline("CommandLine", fCommandLine.Data());
 
         // Write the output
@@ -1974 +1975 @@
         cont.Add(&hest);
         cont.Add(&ganame);
+        cont.Add(&cmdline);
 
         if (fDisplay)

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -118 +118 @@
     cont.Add(const_cast<MSequence*>(&fSequence));
 
+    TNamed cmdline("CommandLine", fCommandLine.Data());
+    cont.Add(&cmdline);
+
     if (fDisplay)
     {
@@ -155 +158 @@
     MDirIter iter;
     if (fSequence.GetRuns(iter, MSequence::kCalibrated)<=0)
+    {
+        *fLog << err << "ERROR - Sequence valid but without files." << endl;
         return kFALSE;
+    }
 
     // Setup Parlist
@@ -267 +273 @@
     plist.AddToList(&par); // without MTriggerPattern stored in the file
 
-    // For the effective on-time calculation we don't want SUM-only events
+    // For the effective on-time calculation and the muon statistics
+    // we don't want SUM-only events
     MFTriggerPattern fsum;
     fsum.SetDefault(kTRUE);
@@ -336 +343 @@
         write.AddContainer("MMcEvt",                "Events");
         write.AddContainer("MMcTrig",               "Events", kFALSE);
+        write.AddContainer("MCorsikaEvtHeader",     "Events", kFALSE);
         write.AddContainer("MSrcPosCam",            "Events");
         // Monte Carlo Run Headers
@@ -342 +350 @@
         write.AddContainer("MMcFadcHeader",         "RunHeaders", kFALSE);
         write.AddContainer("MMcConfigRunHeader",    "RunHeaders", kFALSE);
-        write.AddContainer("MMcCorsikaRunHeader",   "RunHeaders");
+        write.AddContainer("MMcCorsikaRunHeader",   "RunHeaders", kFALSE);
+        write.AddContainer("MCorsikaRunHeader",     "RunHeaders", kFALSE);
     }
     else

trunk/MagicSoft/Mars/mjobs/MJob.h

@@ -38 +38 @@
     // FIXME: Split into MJobSequence and MJobDataSet
     MSequence fSequence;      // Sequence
+
+    TString   fCommandLine;   // Command line for possible storage
 
     const TEnv *GetEnv() const;
@@ -79 +81 @@
     void   SetNullOut(Bool_t b=kTRUE) { fNullOut=b; }
 
+    void   SetCommandLine(const TString &s) { fCommandLine = s; }
+
     // Getter
     TString GetPathOut() const  { return fPathOut; }