Merge branch 'fasermc-r0010-patches' into 'master'

r0010 simulation patches

See merge request faser/calypso!291

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_1000GeV-101312.json

+{
+    "file_length": 5000,
+    "mass": 105.66,
+    "maxE": 1000.0,
+    "minE": 1000.0,
+    "pid": [-13, 13],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 101312,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_muon_fasernu_1000GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_100GeV-101310.json

+{
+    "file_length": 5000,
+    "mass": 105.66,
+    "maxE": 100.0,
+    "minE": 100.0,
+    "pid": [-13, 13],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 101310,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_muon_fasernu_100GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_10GeV-101308.json

+{
+    "file_length": 5000,
+    "mass": 105.66,
+    "maxE": 10.0,
+    "minE": 10.0,
+    "pid": [-13, 13],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 101308,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_muon_fasernu_10GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_300GeV-101311.json

+{
+    "file_length": 5000,
+    "mass": 105.66,
+    "maxE": 300.0,
+    "minE": 300.0,
+    "pid": [-13, 13],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 101311,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_muon_fasernu_300GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_fasernu_30GeV-101309.json

+{
+    "file_length": 5000,
+    "mass": 105.66,
+    "maxE": 30.0,
+    "minE": 30.0,
+    "pid": [-13, 13],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 101309,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_muon_fasernu_30GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_pion_fasernu_1000GeV-121106.json

+{
+    "file_length": 500,
+    "mass": 105.66,
+    "maxE": 1000.0,
+    "minE": 1000.0,
+    "pid": [211, -211],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 121106,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_pion_fasernu_1000GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_pion_fasernu_100GeV-121104.json

+{
+    "file_length": 1000,
+    "mass": 105.66,
+    "maxE": 100.0,
+    "minE": 100.0,
+    "pid": [211, -211],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 121104,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_pion_fasernu_100GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_pion_fasernu_10GeV-121102.json

+{
+    "file_length": 1000,
+    "mass": 105.66,
+    "maxE": 10.0,
+    "minE": 10.0,
+    "pid": [211, -211],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 121102,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_pion_fasernu_10GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_pion_fasernu_300GeV-121105.json

+{
+    "file_length": 1000,
+    "mass": 105.66,
+    "maxE": 300.0,
+    "minE": 300.0,
+    "pid": [211, -211],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 121105,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_pion_fasernu_300GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_pion_fasernu_30GeV-121103.json

+{
+    "file_length": 1000,
+    "mass": 105.66,
+    "maxE": 30.0,
+    "minE": 30.0,
+    "pid": [211, -211],
+    "radius": -25.0,
+    "angle": 0.0006,
+    "run": 121103,
+    "sampler": "const",
+    "segment": 0,
+    "short": "MDC_PG_pion_fasernu_30GeV",
+    "zpos": -3990.0
+}

Control/CalypsoExample/Generation/scripts/submit_faserMDC_particlegun.sh

@@ -199,7 +199,7 @@ if ! [ -z "$outdest" ]
 then
     ls -l
     echo "copy *-HITS.root to $outdest"
-    mkdir -p $outdest
+    eos mkdir -p $outdest 
     eos cp *-HITS.root ${outdest}/ || true
 fi
 #
@@ -209,13 +209,13 @@ then
     cd ..
     ls -l
     echo "copy $logfile to $logdest"
-    mkdir -p $logdest
+    eos mkdir -p $logdest 
     eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
-    mkdir -p $outdest
+    eos mkdir -p $outdest
     eos cp $logfile $outdest/$logfile
 fi

Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh

@@ -163,7 +163,7 @@ else
     tagstr="--reco=$tag"
 fi
 #
-faser_reco.py "--nevents=$nevents" $tagstr "$file_path" 
+faser_reco.py "--nevents=$nevents" --isMC $tagstr "$file_path" 
 #
 # Print out ending time
 date