Merge remote-tracking branch 'origin/master' into pr/nhcal_acceptance

Author: Michał Sieczczyński

.gitlab-ci.yml

@@ -126,6 +126,7 @@ get_data:
 include: 
   - local: 'benchmarks/backgrounds/config.yml'
   - local: 'benchmarks/backwards_ecal/config.yml'
+  - local: 'benchmarks/beamline/config.yml'
   - local: 'benchmarks/calo_pid/config.yml'
   - local: 'benchmarks/ecal_gaps/config.yml'
   - local: 'benchmarks/tracking_detectors/config.yml'
@@ -163,6 +164,7 @@ deploy_results:
     - "collect_results:backwards_ecal"
     - "collect_results:barrel_ecal"
     - "collect_results:barrel_hcal"
+    - "collect_results:beamline"
     - "collect_results:calo_pid"
     - "collect_results:ecal_gaps"
     - "collect_results:lfhcal"

Snakefile

@@ -33,6 +33,7 @@ def find_epic_libraries():
 include: "benchmarks/backgrounds/Snakefile"
 include: "benchmarks/backwards_ecal/Snakefile"
 include: "benchmarks/barrel_ecal/Snakefile"
+include: "benchmarks/beamline/Snakefile"
 include: "benchmarks/calo_pid/Snakefile"
 include: "benchmarks/ecal_gaps/Snakefile"
 include: "benchmarks/material_scan/Snakefile"

benchmarks/backwards_ecal/backwards_ecal.org

@@ -147,7 +147,7 @@ study.
 
 #+begin_src jupyter-python
 e_over_p_hist = {}
-e_over_p_axis = bh.axis.Regular(101, 0., 1.01)
+e_over_p_axis = bh.axis.Regular(110, 0., 1.10)
 
 for ix, energy in enumerate(energies):
     for particle_name, dataset in [("e-", e_eval[energy]), ("pi-", pi_eval[energy])]:

benchmarks/beamline/Snakefile

@@ -0,0 +1,61 @@
+SIMOUTDIR="sim_output/beamline/"
+ANALYSISDIR=SIMOUTDIR+"analysis/"
+
+rule beamline_steering_sim:
+    input:
+        macro=workflow.source_path("beamlineGPS.mac"),
+    output:
+        SIMOUTDIR+"beamlineTest{CAMPAIGN}.edm4hep.root",
+    shell:
+        """
+            exec npsim \
+            --runType run \
+            --enableG4GPS \
+            --macroFile {input.macro} \
+            --compactFile $DETECTOR_PATH/epic_ip6_extended.xml \
+            --outputFile {output} \
+        """
+
+rule beamline_steering_analysis:
+    params:
+        xml=os.getenv("DETECTOR_PATH")+"/epic_ip6_extended.xml",
+    input:
+        script=workflow.source_path("beamlineAnalysis.C"),
+        header=workflow.source_path("shared_functions.h"),
+        data=SIMOUTDIR+"beamlineTest{CAMPAIGN}.edm4hep.root",
+    output:
+        rootfile=ANALYSISDIR+"beamlineTestAnalysis{CAMPAIGN}.root",
+        beamspot_canvas=ANALYSISDIR+"beamspot_{CAMPAIGN}.png",
+        x_px_canvas=ANALYSISDIR+"x_px_{CAMPAIGN}.png",
+        y_py_canvas=ANALYSISDIR+"y_py_{CAMPAIGN}.png",
+        fitted_position_means_stdevs_canvas=ANALYSISDIR+"fitted_position_means_stdevs_{CAMPAIGN}.png",
+        fitted_momentum_means_stdevs_canvas=ANALYSISDIR+"fitted_momentum_means_stdevs_{CAMPAIGN}.png",
+        pipe_parameter_canvas=ANALYSISDIR+"pipe_parameter_{CAMPAIGN}.png",
+    shell:
+        """
+            root -l -b -q '{input.script}("{input.data}", "{output.rootfile}", "{params.xml}",
+            "{output.beamspot_canvas}", "{output.x_px_canvas}", "{output.y_py_canvas}",
+            "{output.fitted_position_means_stdevs_canvas}", "{output.fitted_momentum_means_stdevs_canvas}",
+            "{output.pipe_parameter_canvas}")'
+        """
+
+rule beamline:
+    input:
+        ANALYSISDIR+"beamlineTestAnalysis{CAMPAIGN}.root",
+        ANALYSISDIR+"beamspot_{CAMPAIGN}.png",
+        ANALYSISDIR+"x_px_{CAMPAIGN}.png",
+        ANALYSISDIR+"y_py_{CAMPAIGN}.png",
+        ANALYSISDIR+"fitted_position_means_stdevs_{CAMPAIGN}.png",
+        ANALYSISDIR+"fitted_momentum_means_stdevs_{CAMPAIGN}.png",
+        ANALYSISDIR+"pipe_parameter_{CAMPAIGN}.png",        
+    output:
+        directory("results/beamline/{CAMPAIGN}/")
+    shell:
+        """
+            mkdir {output}        
+            cp {input} {output}
+        """
+
+rule beamline_local:
+    input:
+        "results/beamline/local/"