cleanup/changes from review of PR#400

HEP-FCC · Sep 12, 2024 · 964c072 · 964c072
1 parent a75b7d6
commit 964c072
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,8 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        STACK: [
-                # '/cvmfs/sw.hsf.org/key4hep/setup.sh', #temporarily disable for developing edm4hep v1 code that can only be set up from nightlies currently
+        STACK: ['/cvmfs/sw.hsf.org/key4hep/setup.sh',
                 '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh']
         OS: ['alma9',
              'ubuntu22']
@@ -53,7 +52,4 @@ jobs:
         docker exec CI_container /bin/bash -c 'cd ./Package; \
           source ${{ matrix.STACK }}; \
           source ./setup.sh; \
-          fccanalysis run examples/FCCee/higgs/mH-recoil/mumu/analysis_stage1.py --output myoutput.root --files-list root://eospublic.cern.ch//eos/experiment/fcc/hh/tutorials/edm4hep_tutorial_data/p8_ee_ZH_ecm240.root'
-
-# fccanalysis run examples/FCCee/higgs/mH-recoil/mumu/analysis_stage1.py --output myoutput.root --files-list root://eospublic.cern.ch//eos/experiment/fcc/ee/generation/DelphesEvents/spring2021/IDEA/p8_ee_Zbb_ecm91_EvtGen_Bc2TauNuTAUHADNU/events_131527278.root'
-#temporarily switch to a different file, produced with nightlies, need edm4hep v1 
+          fccanalysis run examples/FCCee/higgs/mH-recoil/mumu/analysis_stage1.py --output myoutput.root --test
diff --git a/examples/FCCee/higgs/mH-recoil/histmaker_recoil.py b/examples/FCCee/higgs/mH-recoil/histmaker_recoil.py
@@ -61,16 +61,12 @@ def build_graph(df, dataset):
     weightsum = df.Sum("weight")
 
     # define some aliases to be used later on
-    # df = df.Alias("Particle0", "Particle#0.index")
-    # df = df.Alias("Particle1", "Particle#1.index")
-
     df = df.Alias("Particle0", "_Particle_daughters.index")
     df = df.Alias("Particle1", "_Particle_parents.index")
 
     df = df.Alias("MCRecoAssociations0", "_MCRecoAssociations_from.index")
     df = df.Alias("MCRecoAssociations1", "_MCRecoAssociations_to.index")
 
-    # df = df.Alias("Muon0", "Muon#0.index")
     df = df.Alias("Muon0", "Muon_objIdx.index")
 
 

diff --git a/examples/FCCee/higgs/mH-recoil/mumu/analysis_stage1.py b/examples/FCCee/higgs/mH-recoil/mumu/analysis_stage1.py
@@ -42,7 +42,8 @@ def __init__(self, cmdline_args):
         # self.prod_tag = 'FCCee/spring2021/IDEA/'
 
         # Optional: output directory, default is local running directory
-        # self.output_dir = ''
+        self.output_dir = 'outputs/FCCee/higgs/mH-recoil/mumu/' \
+                          f'stage1_{self.ana_args.muon_pt}'
 
         # Optional: analysisName, default is ''
         # self.analysis_name = 'My Analysis'
@@ -72,7 +73,6 @@ def analyzers(self, dframe):
             dframe
             # define an alias for muon index collection
             .Alias('Muon0', 'Muon_objIdx.index')
-            # .Alias('Muon0', 'Muon#0.index')
             # define the muon collection
             .Define(
                 'muons',

diff --git a/setup.sh b/setup.sh
@@ -12,9 +12,7 @@ if [ "${0}" != "${BASH_SOURCE}" ]; then
     echo "      ${STACK_PATH}"
     source ${STACK_PATH}
   else
-    #use latest nightly while developing on this branch to have latest edm4hep 
-    source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh
-    # source /cvmfs/sw.hsf.org/key4hep/setup.sh
+    source /cvmfs/sw.hsf.org/key4hep/setup.sh
   fi
 
   if [ -z "${KEY4HEP_STACK}" ]; then