Skip to content
Snippets Groups Projects
Commit 10fade61 authored by Sebastien Ponce's avatar Sebastien Ponce
Browse files

Merge branch 'follow-rec-3231' into 'master' 

follow changes in Rec!3231 - replace a LoKi functor with ThOr

See merge request !799
parents b91048cc 4e0a4cdd
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!799follow changes in Rec!3231 - replace a LoKi functor with ThOr
Pipeline #4907787 passed
Stage: check
    Stage: build
      Stage: docs
        Stage: deploy
          Hide whitespace changes
          Inline Side-by-side
          DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
          + 0
          − 5
          View file @ 10fade61
          ......@@ -7,7 +7,6 @@ RootHistSvc INFO Writing ROOT histograms to: DV-examp
          HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc
          FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
          UnpackChargedProtos.ChargedProto... INFO Using retuned RICH el and mu DLL values in combined DLLs
          FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
          ApplicationMgr INFO Application Manager Initialized successfully
          ApplicationMgr INFO Application Manager Started successfully
          EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
          ......@@ -62,10 +61,6 @@ ParticleRangeFilter INFO Number of counters : 1
          |*"Cut selection efficiency" | 1059 | 21 |( 1.983003 +- 0.4284147)% |
          ToolSvc.HybridFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          ToolSvc.PPFactoryHybridFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          ToolSvc.TrackFunctorFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          UnpackBestTracks INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          | "# Unpacked Tracks" | 10 | 4101 | 410.10 |
          ......
          DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
          + 0
          − 5
          View file @ 10fade61
          ......@@ -9,7 +9,6 @@ FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SV
          MCTruthAndBkgCatAlg#1.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
          MCTruthAndBkgCatAlg#1.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
          MCTruthAndBkgCatAlg#1.Background... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
          FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
          MCTruthAndBkgCatAlg#2.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
          MCTruthAndBkgCatAlg#2.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
          MCTruthAndBkgCatAlg#2.Background... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
          ......@@ -101,7 +100,3 @@ SpruceDecReportsDecoder INFO Number of counters : 1
          | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"| 14 |
          ToolSvc.HltFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          ToolSvc.PPFactoryHybridFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          ToolSvc.TrackFunctorFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
          + 0
          − 5
          View file @ 10fade61
          ......@@ -6,7 +6,6 @@ NTupleSvc INFO Added stream file:DV-test-array-ntp.
          RootHistSvc INFO Writing ROOT histograms to: DV-test-array-his.root
          HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc
          FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
          FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
          ApplicationMgr INFO Application Manager Initialized successfully
          ApplicationMgr INFO Application Manager Started successfully
          EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
          ......@@ -63,7 +62,3 @@ ParticleUnpacker INFO Number of counters : 2
          | "# UnpackedData" | 124 | 70084 | 565.19 |
          ToolSvc.HltFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          ToolSvc.PPFactoryHybridFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          ToolSvc.TrackFunctorFactory INFO Number of counters : 1
          | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
          Phys/DaVinci/python/DaVinci/common_particles.py
          + 3
          − 3
          View file @ 10fade61
          ......@@ -37,7 +37,7 @@ def _make_std_loose_particles(particles, pvs, name):
          @configurable
          def make_std_loose_kaons():
          with standard_protoparticle_filter.bind(Code='PP_HASRICH'):
          with standard_protoparticle_filter.bind(Code=F.PPHASRICH):
          return _make_std_loose_particles(
          make_long_kaons(), _make_pvs_v2(), name='StdLooseKaons')
          ......@@ -93,6 +93,6 @@ def make_long_pions():
          particles = FunctionalParticleMaker(
          InputProtoParticles=charged_protos,
          ParticleID="pion",
          TrackSelector=get_long_track_selector(),
          ProtoParticleFilter=standard_protoparticle_filter()).Particles
          TrackPredicate=get_long_track_selector(),
          ProtoParticlePredicate=standard_protoparticle_filter()).Particles
          return particles
          Phys/DaVinci/python/DaVinci/filter_selectors.py
          + 1
          − 2
          View file @ 10fade61
          ......@@ -15,7 +15,6 @@ Definitions of:
          """
          from GaudiKernel.SystemOfUnits import MeV
          import Functors as F
          from Hlt2Conf.algorithms_thor import require_all
          #################################
          # Default particle cuts
          ......@@ -26,4 +25,4 @@ def default_particle_cuts(pvs):
          """
          Return a string with the default particle standard loose cuts.
          """
          return require_all(F.PT > 250 * MeV, F.MINIPCHI2(pvs) > 4)
          return F.require_all(F.PT > 250 * MeV, F.MINIPCHI2(pvs) > 4)
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment