Changeset 18576 for trunk

Timestamp:

09/06/16 10:14:33 (8 years ago)

Author:

tbretz

Message:

The additional acceptance should be excuted no matter of the setup of corsika; files can start with cer or CER; the source position in the camera is now calculated for convenience and stored in the output

File:

• trunk/Mars/mjobs/MJSimulation.cc (modified) (7 diffs)

trunk/Mars/mjobs/MJSimulation.cc

@@ -76 +76 @@
 #include "MGeomApply.h"
 #include "MParameterCalc.h"
+#include "MSrcPosCalc.h"
 #include "MHillasCalc.h"
 #include "MImgCleanStd.h"
@@ -114 +115 @@
 #include "MParSpline.h"
 #include "MGeomCam.h"
-#include "MMatrix.h"
-
 #include "MPedestalCam.h"
 #include "MPedestalPix.h"
@@ -243 +242 @@
     write.AddContainer("MPointingPos",        "Events", kFALSE);
     write.AddContainer("MSimSourcePos",       "Events", kFALSE);
+    write.AddContainer("MSrcPosCam",          "Events", kFALSE);
 }
 
@@ -582 +582 @@
     cones2.SetParName("ConesTransmission");
     additionalPhotonAcceptance.SetParName("AdditionalPhotonAcceptance");
+    additionalPhotonAcceptance.SetForce(kTRUE);
  
     // --------------------------------------------------------------------------------
@@ -587 +588 @@
     // --------------------------------------------------------------------------------
     MSimPointingPos pointing;
+    MSrcPosCalc     srcposcam;
 
     MSimReflector reflect;
@@ -810 +812 @@
     }
     const char *fmt = fFileOut.IsNull() ?
-        Form("s/cer([0-9]+)([0-9][0-9][0-9])/%s\\/%08d.$2%%s_MonteCarlo$1.root/", Esc(fPathOut).Data(), header.GetRunNumber()) :
+        Form("s/[cC][eE][rR]([0-9]+)([0-9][0-9][0-9])/%s\\/%08d.$2%%s_MonteCarlo$1.root/", Esc(fPathOut).Data(), header.GetRunNumber()) :
         Form("%s/%s%%s.root", Esc(fPathOut).Data(), Esc(fFileOut).Data());
 
@@ -905 +907 @@
         tasks.AddToList(&precut);  // Precut
         tasks.AddToList(&pointing);  // Simulating pointing
+        tasks.AddToList(&srcposcam);  // calculate origin in camera
         tasks.AddToList(&simmmcs);  // Simulating MMCS
         if (!fPathOut.IsNull() && !HasNullOut())  // Write Tasks for corsika infos