From 4663dfb18f29e9d44554c0c9aeac3f27fd87692c Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 26 Mar 2022 13:33:36 +0000
Subject: [PATCH] Reenable inclusive kinematics

---
 options/reconstruction.py | 85 +++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/options/reconstruction.py b/options/reconstruction.py
index 548c63b8..91548de4 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -141,11 +141,11 @@ from Configurables import Jug__Reco__TrackParamVertexClusterInit as TrackParamVe
 from Configurables import Jug__Reco__CKFTracking as CKFTracking
 from Configurables import Jug__Reco__ParticlesFromTrackFit as ParticlesFromTrackFit
 # from Configurables import Jug__Reco__TrajectoryFromTrackFit as TrajectoryFromTrackFit
-#from Configurables import Jug__Reco__InclusiveKinematicsElectron as InclusiveKinematicsElectron
-#from Configurables import Jug__Reco__InclusiveKinematicsDA as InclusiveKinematicsDA
-#from Configurables import Jug__Reco__InclusiveKinematicsJB as InclusiveKinematicsJB
-#from Configurables import Jug__Reco__InclusiveKinematicsSigma as InclusiveKinematicsSigma
-#from Configurables import Jug__Reco__InclusiveKinematicseSigma as InclusiveKinematicseSigma
+from Configurables import Jug__Reco__InclusiveKinematicsElectron as InclusiveKinematicsElectron
+from Configurables import Jug__Reco__InclusiveKinematicsDA as InclusiveKinematicsDA
+from Configurables import Jug__Reco__InclusiveKinematicsJB as InclusiveKinematicsJB
+from Configurables import Jug__Reco__InclusiveKinematicsSigma as InclusiveKinematicsSigma
+from Configurables import Jug__Reco__InclusiveKinematicseSigma as InclusiveKinematicseSigma
 
 from Configurables import Jug__Reco__FarForwardParticles as FFRecoRP
 from Configurables import Jug__Reco__FarForwardParticlesOMD as FFRecoOMD
@@ -243,11 +243,11 @@ dummy = MC2DummyParticle("dummy",
 algorithms.append(dummy)
 
 # Truth level kinematics
-#truth_incl_kin = InclusiveKinematicsTruth("truth_incl_kin",
-#        inputMCParticles="MCParticles",
-#        outputData="InclusiveKinematicsTruth"
-#)
-#algorithms.append(truth_incl_kin)
+truth_incl_kin = InclusiveKinematicsTruth("truth_incl_kin",
+        inputMCParticles="MCParticles",
+        outputData="InclusiveKinematicsTruth"
+)
+algorithms.append(truth_incl_kin)
 
 ## Roman pots
 ffi_romanpot_coll = SimTrackerHitsCollector("ffi_romanpot_coll",
@@ -883,36 +883,41 @@ if 'acadia' in detector_version:
     algorithms.append(mrich_reco)
 
 # Inclusive kinematics
-#incl_kin_electron = InclusiveKinematicsElectron("incl_kin_electron",
-#        inputMCParticles="MCParticles",
-#        inputParticles="ReconstructedParticles",
-#        outputData="InclusiveKinematicsElectron"
-#)
-#algorithms.append(incl_kin_electron)
-#incl_kin_jb = InclusiveKinematicsJB("incl_kin_jb",
-#        inputMCParticles="MCParticles",
-#        inputParticles="ReconstructedParticles",
-#        outputData="InclusiveKinematicsJB"
-#)
-#algorithms.append(incl_kin_jb)
-#incl_kin_da = InclusiveKinematicsDA("incl_kin_da",
-#        inputMCParticles="MCParticles",
-#        inputParticles="ReconstructedParticles",
-#        outputData="InclusiveKinematicsDA"
-#)
-#algorithms.append(incl_kin_da)
-#incl_kin_sigma = InclusiveKinematicsSigma("incl_kin_sigma",
-#        inputMCParticles="MCParticles",
-#        inputParticles="ReconstructedParticles",
-#        outputData="InclusiveKinematicsSigma"
-#)
-#algorithms.append(incl_kin_sigma)
-#incl_kin_esigma = InclusiveKinematicseSigma("incl_kin_esigma",
-#        inputMCParticles="MCParticles",
-#        inputParticles="ReconstructedParticles",
-#        outputData="InclusiveKinematicseSigma"
-#)
-#algorithms.append(incl_kin_esigma)
+incl_kin_electron = InclusiveKinematicsElectron("incl_kin_electron",
+        inputMCParticles="MCParticles",
+        inputParticles="ReconstructedParticles",
+        inputAssociations = "ReconstructedParticlesAssoc"
+        outputData="InclusiveKinematicsElectron"
+)
+algorithms.append(incl_kin_electron)
+incl_kin_jb = InclusiveKinematicsJB("incl_kin_jb",
+        inputMCParticles="MCParticles",
+        inputParticles="ReconstructedParticles",
+        inputAssociations = "ReconstructedParticlesAssoc"
+        outputData="InclusiveKinematicsJB"
+)
+algorithms.append(incl_kin_jb)
+incl_kin_da = InclusiveKinematicsDA("incl_kin_da",
+        inputMCParticles="MCParticles",
+        inputParticles="ReconstructedParticles",
+        inputAssociations = "ReconstructedParticlesAssoc"
+        outputData="InclusiveKinematicsDA"
+)
+algorithms.append(incl_kin_da)
+incl_kin_sigma = InclusiveKinematicsSigma("incl_kin_sigma",
+        inputMCParticles="MCParticles",
+        inputParticles="ReconstructedParticles",
+        inputAssociations = "ReconstructedParticlesAssoc"
+        outputData="InclusiveKinematicsSigma"
+)
+algorithms.append(incl_kin_sigma)
+incl_kin_esigma = InclusiveKinematicseSigma("incl_kin_esigma",
+        inputMCParticles="MCParticles",
+        inputParticles="ReconstructedParticles",
+        inputAssociations = "ReconstructedParticlesAssoc"
+        outputData="InclusiveKinematicseSigma"
+)
+algorithms.append(incl_kin_esigma)
 
 # Output
 podout = PodioOutput("out", filename=output_rec)
-- 
GitLab