Changeset 18282 for branches/MarsGapdTimeJitter/mjobs

Timestamp:

08/18/15 10:28:44 (10 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• mjobs/MJSimulation.cc (modified) (6 diffs)

branches/MarsGapdTimeJitter/mjobs/MJSimulation.cc

@@ -244 +244 @@
     write.AddContainer("MRawEvtHeader",       "Events");
     write.AddContainer("MMcEvt",              "Events", kFALSE);
+    write.AddContainer("MMcEvtBasic",         "Events", kFALSE);
     write.AddContainer("IncidentAngle",       "Events", kFALSE);
     write.AddContainer("MPointingPos",        "Events", kFALSE);
+    write.AddContainer("MSimSourcePos",       "Events", kFALSE);
 }
 
@@ -439 +441 @@
     MParSpline splinecones("ConesAngularAcceptance");
     MParSpline splinecones2("ConesTransmission");
+    MParSpline splineAdditionalPhotonAcceptance("AdditionalPhotonAcceptance");
     plist.AddToList(&splinepde);
     plist.AddToList(&splinemirror);
     plist.AddToList(&splinecones);
     plist.AddToList(&splinecones2);
+    plist.AddToList(&splineAdditionalPhotonAcceptance);
 
     const TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
@@ -458 +462 @@
     MSimAbsorption cones("SimConesAngularAcceptance");
     MSimAbsorption cones2("SimConesTransmission");
+    MSimAbsorption additionalPhotonAcceptance("SimAdditionalPhotonAcceptance");
     absapd.SetParName("PhotonDetectionEfficiency");
     absmir.SetParName("MirrorReflectivity");
@@ -463 +468 @@
     cones.SetUseTheta();
     cones2.SetParName("ConesTransmission");
+    additionalPhotonAcceptance.SetParName("AdditionalPhotonAcceptance");
  
     MSimPointingPos pointing;
@@ -654 +660 @@
     write3af.AddContainer("MRawEvtData",      "Events");
     write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
-    write3af.AddContainer("MPhotonEvent","Events");
 
     write3ar.AddContainer("ElectronicNoise",  "RunHeaders", kTRUE, 1);
@@ -804 +809 @@
             tasks.AddToList(&absapd);
             tasks.AddToList(&absmir);
+            tasks.AddToList(&additionalPhotonAcceptance);
             if (0)
                 tasks.AddToList(&simatm); // FASTER?