Making veawer example run on EDM4hep 1.0 files (#460)

* Making weaver example run on EDM4hep 1.0 files

* Adjusting include headers

Author: kjvbrt

CMakeLists.txt

@@ -49,7 +49,9 @@ include(GNUInstallDirs)
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
 set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
 set(INSTALL_INCLUDE_DIR include CACHE PATH
-  "Installation directory for header files")
+    "Installation directory for header files")
+set(INSTALL_SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH
+    "Installation directory for shared resources")
 
 
 #--- Declare C++ Standard -----------------------------------------------------

analyzers/dataframe/FCCAnalyses/JetConstituentsUtils.h

@@ -1,10 +1,18 @@
 #ifndef FCCAnalyses_JetConstituentsUtils_h
 #define FCCAnalyses_JetConstituentsUtils_h
 
+// ROOT
 #include "ROOT/RVec.hxx"
-#include "edm4hep/ReconstructedParticle.h"
-#include "edm4hep/MCParticle.h"
+#include "TLorentzVector.h"
+#include "TMath.h"
+#include "TRotation.h"
+#include "TVector3.h"
+// EDM4hep
+#include "edm4hep/CalorimeterHitData.h"
+#include "edm4hep/ClusterData.h"
+#include "edm4hep/MCParticleData.h"
 #include "edm4hep/RecDqdxData.h"
+#include "edm4hep/ReconstructedParticleData.h"
 #if __has_include("edm4hep/TrackerHit3DData.h")
 #include "edm4hep/TrackerHit3DData.h"
 #else
@@ -13,14 +21,11 @@ namespace edm4hep {
   using TrackerHit3DData = edm4hep::TrackerHitData;
 }
 #endif
-
+#include "edm4hep/TrackData.h"
+#include "edm4hep/TrackState.h"
+// FastJet
 #include "fastjet/JetDefinition.hh"
-
-#include "TMath.h"
-#include "TVector3.h"
-#include "TRotation.h"
-#include "TLorentzVector.h"
-
+// FCCAnalyses
 #include "FCCAnalyses/TrackUtils.h"
 
 namespace FCCAnalyses {

analyzers/dataframe/FCCAnalyses/LinkDef.h

@@ -29,6 +29,7 @@
 #pragma link C++ class ROOT::VecOps::RVec<edm4hep::MCParticleData>+;
 #pragma link C++ class ROOT::VecOps::RVec<ROOT::VecOps::RVec<edm4hep::ReconstructedParticleData>>+;
 #pragma link C++ class ROOT::VecOps::RVec<edm4hep::TrackData>+;
+#pragma link C++ class ROOT::VecOps::RVec<edm4hep::RecDqdxData>+;
 
 // Vectors
 #pragma link C++ class ROOT::VecOps::RVec<std::vector<int>>+;

analyzers/dataframe/src/JetConstituentsUtils.cc

@@ -1,24 +1,17 @@
 #include "FCCAnalyses/JetConstituentsUtils.h"
 
-// FCCAnalyses
-#include "FCCAnalyses/JetClusteringUtils.h"
-#include "FCCAnalyses/ReconstructedParticle.h"
-#include "FCCAnalyses/ReconstructedParticle2MC.h"
-#include "FCCAnalyses/ReconstructedParticle2Track.h"
-#include "FCCAnalyses/ReconstructedTrack.h"
 // EDM4hep
-#include "edm4hep/MCParticleData.h"
-#include "edm4hep/Track.h"
-#include "edm4hep/TrackData.h"
-#include "edm4hep/Cluster.h"
-#include "edm4hep/ClusterData.h"
-#include "edm4hep/CalorimeterHitData.h"
-#include "edm4hep/ReconstructedParticleData.h"
 #include "edm4hep/EDM4hepVersion.h"
 // FastJet
 #include "fastjet/JetDefinition.hh"
 #include "fastjet/PseudoJet.hh"
 #include "fastjet/Selector.hh"
+// FCCAnalyses
+#include "FCCAnalyses/JetClusteringUtils.h"
+#include "FCCAnalyses/ReconstructedParticle.h"
+#include "FCCAnalyses/ReconstructedParticle2MC.h"
+#include "FCCAnalyses/ReconstructedParticle2Track.h"
+#include "FCCAnalyses/TrackUtils.h"
 
 /* *************************
 //COMMENTS

analyzers/dataframe/src/SmearObjects.cc

@@ -319,9 +319,6 @@ ROOT::VecOps::RVec<edm4hep::RecDqdxData> SmearedTracksdNdx::operator()(
   TrkUtil tu;
 
   for (int itrack = 0; itrack < ntracks; itrack++) {
-    // auto dNdxObject =
-    //     ReconstructedTrack::get_dNdxObject(itrack, dNdxColl,
-    //     dNdxTrackIndexes);
     auto dNdxSmeared = edm4hep::RecDqdxData{};
     dNdxSmeared.dQdx.value = 0.;
     dNdxSmeared.dQdx.type = 0;

cmake/FCCAnalysesFunctions.cmake

@@ -39,7 +39,7 @@ function(add_integration_test _testname)
           )
   set_property(TEST fccanalysisrun_${_testname} APPEND PROPERTY ENVIRONMENT
     LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/analyzers/dataframe:$ENV{LD_LIBRARY_PATH}
-    PYTHONPATH=${CMAKE_SOURCE_DIR}/python:${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}
+    PYTHONPATH=${CMAKE_SOURCE_DIR}/python:${INSTALL_SHARE_DIR}/examples:${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}
     PATH=${CMAKE_SOURCE_DIR}/bin:${CMAKE_BINARY_DIR}:$ENV{PATH}
     ROOT_INCLUDE_PATH=${CMAKE_SOURCE_DIR}/analyzers/dataframe:$ENV{ROOT_INCLUDE_PATH}
     TEST_INPUT_DATA_DIR=${TEST_INPUT_DATA_DIR}

examples/FCCee/weaver/config.py

@@ -15,10 +15,10 @@
     "PFTracks": "EFlowTrack",
     "PFPhotons": "EFlowPhoton",
     "PFNeutralHadrons": "EFlowNeutralHadron",
-    "TrackState": "EFlowTrack_1",
+    "TrackState": "_EFlowTrack_trackStates",
     "TrackerHits": "TrackerHits",
     "CalorimeterHits": "CalorimeterHits",
-    "dNdx": "EFlowTrack_2",
+    "dNdx": "EFlowTrack_dNdx",
     "PathLength": "EFlowTrack_L",
     "Bz": "magFieldBz",
 }

examples/FCCee/weaver/stage1.py

@@ -7,17 +7,14 @@
 from addons.ONNXRuntime.jetFlavourHelper import JetFlavourHelper
 from addons.FastJet.jetClusteringHelper import ExclusiveJetClusteringHelper
 
-jetFlavourHelper = None
-jetClusteringHelper = None
+testFile = 'https://fccsw.web.cern.ch/fccsw/analysis/test-samples/' \
+           'edm4hep099/wzp6_ee_nunuH_Hss_ecm240.root'
 
 # Mandatory: RDFanalysis class where the use defines the operations on the TTree
 class RDFanalysis:
     # __________________________________________________________
     # Mandatory: analysers funtion to define the analysers to process, please make sure you return the last dataframe, in this example it is df2
     def analysers(df):
-        global jetClusteringHelper
-        global jetFlavourHelper
-
         from examples.FCCee.weaver.config import collections, njets
 
         ## define jet clustering parameters

tests/CMakeLists.txt

@@ -8,6 +8,7 @@ add_integration_test("examples/FCCee/higgs/mH-recoil/mumu/analysis_stage1.py")
 add_integration_test("examples/FCCee/flavour/Bc2TauNu/analysis_B2TauNu_truth.py")
 add_integration_test("examples/FCCee/test/jet_constituents.py")
 add_integration_test("examples/FCCee/vertex_lcfiplus/analysis_V0.py")
+add_integration_test("examples/FCCee/weaver/stage1.py")
 
 add_standalone_test("examples/FCCee/fullSim/caloNtupleizer/analysis.py")