Changeset 8383 for trunk/MagicSoft/Mars/mjobs

Timestamp:

03/28/07 13:43:28 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCut.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -55 +55 @@
 #include "MTaskEnv.h"
 #include "MPointingDevCalc.h"
+#include "MParameterCalc.h"
 #include "MSrcPosRndm.h"
 #include "MSrcPosCalc.h"
@@ -375 +376 @@
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");
+    write->AddContainer("RunNumber",      "Events");
+    write->AddContainer("EvtNumber",      "Events");
     //    write->AddContainer("MMuonSearchPar", "Events", kFALSE);
     //    write->AddContainer("MMuonCalibPar",  "Events", kFALSE);
@@ -549 +552 @@
     MParList plist;
 
-    MHSrcPosCam hsrcpos;
+    MHSrcPosCam hsrcpos(fIsWobble);
     if (!fIsWobble && source.IsInitialized() && fRndmSrcPos)
     {
@@ -662 +665 @@
     taskenv3.SetDefault(fCalcDisp);
 
+    MParameterCalc setevtnum("MRawEvtHeader.fDAQEvtNumber", "SetEvtNumber");
+    setevtnum.SetNameParameter("EvtNumber");
+
+    MParameterCalc setrunnum("MRawRunHeader.fRunNumber", "SetRunNumber");
+    setrunnum.SetNameParameter("RunNumber");
+
     //    MFillH fill0a("OnPos [MHSrcPosCam]", "MSrcPosCam", "FillSrcPosCam");
     MFillH fill1a("MHHillasOffPre  [MHHillas]",      "MHillas",      "FillHillasPre");
@@ -714 +723 @@
     tlist2.AddToList(&taskenv2);
     tlist2.AddToList(&taskenv3);
+    tlist2.AddToList(&setrunnum);
+    tlist2.AddToList(&setevtnum);
     if (write0)
         tlist2.AddToList(write0);
@@ -895 +906 @@
         tlist2.RemoveFromList(&srcrndm);
     }
+
+    MFillH fillsrc(&hsrcpos, "MSrcPosCam", "FillSrcPosCam");
+    fillsrc.SetNameTab("SrcPos");
+    if (fIsWobble)
+        tlist2.AddToListBefore(&fillsrc, &hcalc);
+
     if (!fWriteOnly)
     {