Merge branch 'jzhuo_NeutralCaloInfo' into 'master'

Add more functors to access neutral CALO information

See merge request !836

DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py

@@ -158,9 +158,9 @@ def all_variables(pvs, dtf, mctruth, ptype, candidates=None, ftAlg=None):
         all_vars.update({'HCALPIDE': F.HCALPIDE})
         all_vars.update({'HCALPIDMU': F.HCALPIDMU})
         all_vars.update({'ELECTRONSHOWEREOP': F.ELECTRONSHOWEREOP})
-        all_vars.update({'CLUSTERMATCH': F.CLUSTERMATCH})
-        all_vars.update({'ELECTRONMATCH': F.ELECTRONMATCH})
-        all_vars.update({'BREMHYPOMATCH': F.BREMHYPOMATCH})
+        all_vars.update({'CLUSTERMATCH': F.CLUSTERMATCH_CHI2})
+        all_vars.update({'ELECTRONMATCH': F.ELECTRONMATCH_CHI2})
+        all_vars.update({'BREMHYPOMATCH': F.BREMHYPOMATCH_CHI2})
         all_vars.update({'ELECTRONENERGY': F.ELECTRONENERGY})
         all_vars.update({'BREMHYPOENERGY': F.BREMHYPOENERGY})
         all_vars.update({'BREMHYPODELTAX': F.BREMHYPODELTAX})
@@ -267,7 +267,7 @@ def all_variables(pvs, dtf, mctruth, ptype, candidates=None, ftAlg=None):
         all_vars.update({'SDOCA': F.SDOCA(1, 2)})
         all_vars.update({'SDOCACHI2': F.SDOCACHI2(1, 2)})
     if basic:
-        all_vars.update({'SHOWER_SHAPE': F.SHOWER_SHAPE})
+        all_vars.update({'SHOWER_SHAPE': F.CALO_NEUTRAL_SHOWER_SHAPE})
 
     if comp:
         all_vars.update({

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_collections.py

@@ -98,6 +98,7 @@ def main(options: Options):
         FC.MCVertexInfo(mctruth_alg=MCTRUTH),
         FC.MCPromptDecay(mctruth_alg=MCTRUTH),
         FC.TrackIsolation(iso_rel_table=iso_rel_table),
+        FC.NeutralCaloInfo(),
         FC.ParticleID()
     ]