From 622d3fe8c1fd133b36972770eae49f31c5efd166 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:01:07 +0100 Subject: [PATCH 01/50] v1r0 --- Phys/CommonParticles/cmt/requirements | 27 + Phys/CommonParticles/cmt/version.cmt | 1 + Phys/CommonParticles/doc/release.notes | 857 ++++++++++++++++++ .../python/CommonParticles/StandardBasic.py | 41 + .../CommonParticles/StandardBasicCharged.py | 50 + .../CommonParticles/StandardBasicNeutral.py | 44 + .../python/CommonParticles/StandardD0.py | 45 + .../CommonParticles/StandardDiElectron.py | 45 + .../python/CommonParticles/StandardDiMuon.py | 51 ++ .../python/CommonParticles/StandardDplus.py | 42 + .../python/CommonParticles/StandardDstar.py | 42 + .../CommonParticles/StandardElectrons.py | 46 + .../python/CommonParticles/StandardEta.py | 40 + .../CommonParticles/StandardIntermediate.py | 58 ++ .../python/CommonParticles/StandardJpsi.py | 51 ++ .../python/CommonParticles/StandardKaons.py | 49 + .../python/CommonParticles/StandardKstar.py | 43 + .../python/CommonParticles/StandardLambdac.py | 42 + .../python/CommonParticles/StandardMuons.py | 48 + .../python/CommonParticles/StandardPhi.py | 41 + .../python/CommonParticles/StandardPhotons.py | 45 + .../python/CommonParticles/StandardPi0.py | 43 + .../python/CommonParticles/StandardPions.py | 52 ++ .../python/CommonParticles/StandardProtons.py | 49 + .../python/CommonParticles/StandardRho.py | 41 + .../python/CommonParticles/StandardV0.py | 42 + .../CommonParticles/StdLTUnbiasedJpsi2MuMu.py | 44 + .../CommonParticles/StdLooseAllPhotons.py | 57 ++ .../CommonParticles/StdLooseCnvPhotons.py | 56 ++ .../python/CommonParticles/StdLooseD02HH.py | 84 ++ .../python/CommonParticles/StdLooseD02KsHH.py | 71 ++ .../CommonParticles/StdLooseDetachedKstar.py | 23 + .../CommonParticles/StdLooseDetachedPhi.py | 43 + .../CommonParticles/StdLooseDiElectron.py | 33 + .../python/CommonParticles/StdLooseDiMuon.py | 33 + .../CommonParticles/StdLooseDiMuonSameSign.py | 29 + .../CommonParticles/StdLooseDownKaons.py | 52 ++ .../python/CommonParticles/StdLooseDplus.py | 104 +++ .../CommonParticles/StdLooseDstarWithD2HH.py | 78 ++ .../CommonParticles/StdLooseElectrons.py | 60 ++ .../CommonParticles/StdLooseJpsi2MuMu.py | 42 + .../python/CommonParticles/StdLooseJpsi2ee.py | 47 + .../python/CommonParticles/StdLooseKaons.py | 52 ++ .../python/CommonParticles/StdLooseKs.py | 67 ++ .../python/CommonParticles/StdLooseKstar.py | 44 + .../python/CommonParticles/StdLooseLambda.py | 74 ++ .../python/CommonParticles/StdLooseLambdac.py | 46 + .../CommonParticles/StdLooseMergedPi0.py | 50 + .../python/CommonParticles/StdLooseMuons.py | 56 ++ .../python/CommonParticles/StdLoosePhi.py | 42 + .../python/CommonParticles/StdLoosePhotons.py | 56 ++ .../python/CommonParticles/StdLoosePions.py | 56 ++ .../python/CommonParticles/StdLooseProtons.py | 56 ++ .../CommonParticles/StdLooseResolvedEta.py | 53 ++ .../CommonParticles/StdLooseResolvedPi0.py | 52 ++ .../python/CommonParticles/StdLooseRho0.py | 48 + .../python/CommonParticles/StdLooseRhoPlus.py | 57 ++ .../StdMassConstrainedJpsi2MuMu.py | 43 + .../CommonParticles/StdNoPIDsDownElectrons.py | 49 + .../CommonParticles/StdNoPIDsDownPions.py | 50 + .../CommonParticles/StdNoPIDsDownProtons.py | 50 + .../CommonParticles/StdNoPIDsElectrons.py | 49 + .../python/CommonParticles/StdNoPIDsKaons.py | 49 + .../python/CommonParticles/StdNoPIDsMuons.py | 49 + .../python/CommonParticles/StdNoPIDsPions.py | 49 + .../CommonParticles/StdNoPIDsProtons.py | 49 + .../CommonParticles/StdNoPIDsUpElectrons.py | 49 + .../CommonParticles/StdNoPIDsUpPions.py | 50 + .../CommonParticles/StdNoPIDsVeloElectrons.py | 49 + .../CommonParticles/StdTightElectrons.py | 60 ++ .../python/CommonParticles/StdTightKaons.py | 56 ++ .../python/CommonParticles/StdTightMuons.py | 56 ++ .../python/CommonParticles/StdTightPions.py | 57 ++ .../python/CommonParticles/StdTightProtons.py | 55 ++ .../CommonParticles/StdVeryLooseD02HH.py | 77 ++ .../StdVeryLooseDetachedKstar.py | 31 + .../CommonParticles/StdVeryLooseDiMuon.py | 33 + .../CommonParticles/StdVeryLooseDplus.py | 72 ++ .../StdVeryLooseDstarWithD2HH.py | 84 ++ .../CommonParticles/StdVeryLooseJpsi2MuMu.py | 42 + .../CommonParticles/StdVeryLooseLambdac.py | 45 + .../CommonParticles/StdVeryLooseMuons.py | 56 ++ .../python/CommonParticles/Utils.py | 126 +++ .../python/CommonParticles/__init__.py | 7 + .../commonparticles.qms/test_load_modules.qmt | 7 + .../tests/test_load_modules.py | 56 ++ 86 files changed, 5105 insertions(+) create mode 100755 Phys/CommonParticles/cmt/requirements create mode 100644 Phys/CommonParticles/cmt/version.cmt create mode 100755 Phys/CommonParticles/doc/release.notes create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardBasic.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardBasicCharged.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardD0.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardDiMuon.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardDplus.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardDstar.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardEta.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardJpsi.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardKstar.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardLambdac.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardPhi.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardPhotons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardPi0.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardRho.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardV0.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseKs.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLoosePions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsVeloElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/Utils.py create mode 100755 Phys/CommonParticles/python/CommonParticles/__init__.py create mode 100644 Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_load_modules.qmt create mode 100755 Phys/CommonParticles/tests/test_load_modules.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements new file mode 100755 index 000000000..77d0e9195 --- /dev/null +++ b/Phys/CommonParticles/cmt/requirements @@ -0,0 +1,27 @@ +#============================================================================ +# Created : 2003-11-07 +# Maintainer : Olivier Deschamps, P. Koppenburg, J. Palacios +# +# Documentation on the requirement file can be found at +# http://cern.ch/lhcb-comp/Support/html/new_structure.pdf +#============================================================================ +package CommonParticles +version v7r5 + +#============================================================================ +# Structure, i.e. directories to process. +#============================================================================ +branches cmt doc python + +use GaudiPolicy v* + +use TrackTools v* Tr + +apply_pattern install_python_modules + +#============================================================================ +# Used packages. +#============================================================================ +use DaVinciKernel v* Phys +#============================================================================ +apply_pattern QMTest \ No newline at end of file diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt new file mode 100644 index 000000000..805e9dc99 --- /dev/null +++ b/Phys/CommonParticles/cmt/version.cmt @@ -0,0 +1 @@ +v7r5 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes new file mode 100755 index 000000000..433d0cace --- /dev/null +++ b/Phys/CommonParticles/doc/release.notes @@ -0,0 +1,857 @@ +!$Id: release.notes,v 1.194 2010-09-09 08:44:10 jpalac Exp $ +!----------------------------------------------------------------------------- +! Package : Phys/CommonParticles +! Responsible : P. Koppenburg, Juan Palacios +! Purpose : Common particles +! +! When adding a Particle make sure it is appended to one of the Standard* files +! +!----------------------------------------------------------------------------- + +!========================== CommonParticles v7r5 2010-10-04 =================== + +! 2010-10-01 - Jibo He + - python/CommonParticles/StandardDiMuon.py + + Added StdLooseDiMuonSameSign to make it function. + +! 2010-10-01 - Jibo He + - python/CommonParticles/StdLooseDiMuon.py + . Removed mass cut + - python/CommonParticles/StdLooseDiMuonSameSign.py + + Added same sign loose dimuon + +! 2010-09-21 - Rob Lambert + - Made CommonParticles depend on Tr/TrackTools, now that Phys depends on Rec. + +! 2010-09-21 - Greig Cowan + - Added ADOCACHI2 cuts to numerous common particles and removed + explicit track chi2 requirements. + - Removed VDOF from many CommonParticles. + +! 2010-09-20 - Juan Palacios + - python/CommonParticles/StdLooseRho0.py + . Remove StdLooseRho0.DaughtersCuts = { "pi+" : "TRUE" }. This cut is + unnecessary and doesn't work anyway. + +! 2010-09-20 - Thomas Blake + - Updated to use ADCOACHI2CUT instead of ADOCACHI2 + +! 2010-09-17 - Thomas Blake + - Updated trackSelector cuts for StdNoPIDsDowns{Pions/Protons} to + Chi2Cut < 10 + - Added ADOCACHI2 cuts to numerous common particles and removed + explicit track chi2 requirements. + - Updated StdLooseLambdac to use StdLoose particles. + +! 2010-09-17 - Greig Cowan + - Added ADOCACHI2 cuts to most of the common particles to speed up their + creation. Also removed TRCHI2NDOF cuts since defaults are now set to <5. + +! 2010-09-16 - Chris Jones + - Update the default tracking cuts as applied to all common particles, via + the DefaultTrackingCuts Configurable in Utils.py + Previously the default was for no additional track selection cuts to be + applied when creating Particles from ProtoParticles. Now the default cut + is chi^2 < 5 + - I also removed the method useCutSet, which is really redundant as the default + cuts can just be set directly. Also, doing this should really be + discouraged and removing the method does this ... + +! 2010-09-09 - Juan Palacios + - python/CommonParticles/StdLooseDplus.py + . Attempt to fix buggy StdLooseDplus2hhh.CombinationCut. + . NEEDS TO BE CONFIRMED BY VAVA! + - cmt/requirements + . Increase to v7r4p1 + +!========================== CommonParticles v7r4 2010-09-06 =================== + +! 2010-09-06 Stefania Vecchi + - Removed StdNoPIDsUpPions from the input container of StdVeryLooseDstarWithD2HH.py + - Changes in StdVeryLooseD02HH: Use StdLooseKaons, reduced D0 mass window to 100MeV + +! 2010-09-05 Greig Cowan + - Removed mass constraint chi2 cut on Jpsi and tightened StdVeryLooseDstarWithD2HH + +! 2010-08-24 Rolf Oldeman + - Added new StdLooseLambdac + +! 2010-08-24 Greig Cowan + - Added new StdMassConstrainedJpsi2MuMu for use by beta_s B2JpsiX selections. + +! 2010-08-24 Yasmine Amhis + - Change track chi2/ndof (20 -> 10) cut of pions and proton in StdLooseLambda.py + +! 2010-08-11 - Ulrich Kerzel +- Add StdNoPIDsElectrons for Upstream, Downstream and VELO tracks + (one new class of particles for each) + +! 2010-08-10 - V. Gligorov + - Add a generic D+->hhh to StdLooseDplus, using the WM functors to prevent multiple + combinatorics. + +!========================== CommonParticles v7r3 2010-06-24 =================== + +! 2010-06-03 - Yasmine Amhis + - Add Standard Loose Downstream Kaons. + - Update Standard Kaons. + +! 2010-05-21 - Olivier Deschamps + - StdTight/LooseElectrons : remove obsolete BremCor setting. + + +!========================== CommonParticles v7r2 2010-05-24 =================== + +! 2010-05-21 - Patrick Koppenburg + - J/psi -> ee Typo fix + - DiElectron mass removed + +! 2010-05-20 - Patrick Koppenburg + - Loosened the mass window of J/psi->ee + +! 2010-05-19 - Greig Cowan + - Loosened Dstar mass window in StdVeryLooseDstarWithD2HH.py. + +!========================== CommonParticles v7r1 2010-04-30 =================== + +! 2010-04-22 - Juan Palacios + - Add py.tests and QMTests. These will fail as at the moment nothing can + be loaded in the Analysis environment, since this package needs REC! + - Increase to v7r1. + +!========================== CommonParticles v7r0 2010-04-08 =================== + +!========================== CommonParticles v6r5 2010-01-26 =================== +! 2010-01-26 - Patrick Koppenburg + - Very Loose DiMuon + +! 2010-01-25 - Patrick Koppenburg + - Very Loose K* has chi2 of 64 + +! 2010-01-22 - Patrick Koppenburg + - Remove all DC06 options + - v7r0 + +! 2010-01-22 - Patrick Koppenburg + - Add StdVeryLooseDetachedKstar + - v6r5 + +!========================= CommonParticles v6r4 2010-01-19 =================== +! 2010-01-18 - Greig Cowan + - Added StdVeryLooseJpsi for B2JpsiX strippings. + +! 2010-01-06 - Patrick Koppenburg + - Added StdLooseResolvedEta (completes task #13084) + +! 2010-01-05 - Patrick Koppenburg + - Correct buggy StdVeryLooseDstarWithD2HH + +! 2009-12-23 - Anton Poluektov + - Added StdVeryLooseDstarWithD2HH (Marta Calvi) + +! 2009-12-14 - Anton Poluektov + - Added StdVeryLooseD0HH, StdVeryLooseDplus and StdVeryLooseLambdac by Liming Zhang. + +! 2009-12-09 - Patrick Koppenburg + - New StdLooseDiElectron, a copy of the StdLooseDiMuon + - v6r3 + +!========================= CommonParticles v6r3 2009-11-16 =================== +!========================= CommonParticles v6r2 2009-10-28 =================== + +! 2009-10-09 - Patrick Koppenburg + - Added Lambda as a pure copy of Ks with pi+ -> p+ + - Reshuffled a few particles into appropriate categories Standard*.py + - Moved explicit loading of Std* out of StandardIntermediate + -> should do the same + +! 2009-10-08 - Patrick Koppenburg + - New file StdNoPIDsUpPions.py for upstream pions + - New file StdVeryLooseMuons.py for Muons with IsMuonLoose + - Updated StdDC06Muons to use {"RequiresDet='MUON' IsMuon=True" } + . This restores the efficiency of muon ID to 8% instead of 82% + - Updated StdDC06TightMuons to use {"RequiresDet='MUON' IsMuon=True" CombDLL(mu-pi)>'-3.0'" } + . This restores the efficiency of muon ID to 6% instead of 40% + - v6r2 + +!========================= CommonParticles v6r1 2009-08-11 =================== + +! 2009-08-04 - Chris Jones + - Update Muon Selections to use new ProtoParticleFilter options to select + either IsMuon or IsMuonLoose candidates e.g. + + fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) + fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] + +!========================= CommonParticles v6r0 2009-07-21 =================== + +! 2009-07-21 - Chris Jones + - Update Track selection so default cuts set is now NULL (I.e. no cuts) + following requests from the physics working groups. + + This can be changed via :- + + from CommonParticles.Utils import DefaultTrackingCuts + + # Set cuts to default (proposed) Loose selection + DefaultTrackingCuts().useCutSet("Loose") + + # Set by hand to custom values + DefaultTrackingCuts().Cuts = { "Chi2Cut" : [ 0, 10 ] } + + The Cut Set "Loose" (currently) corresponds to the cuts + + Cut Min. Max. + ---------------------------------- + "Chi2Cut" : [ 0, 10 ] + "LikelihoodCut" : [ -100, 9e40 ] + "CloneDistCut" : [ -1e10, 9e40 ] + "GhostProbCut" : [ -1, 0.99 ] + +! 2009-07-10 - Greig Cowan + - Added vertex chi2 cut to phi in StdLooseDetachedPhi. + +! 2009-07-09 - V. Gligorov + - Removed all PID cuts from the standard D02HH and Dplus particles. + +! 2009-07-09 - Rob Lambert + - Added StdLooseDetachedKstar to StandardIntermediate + +! 2009-07-09 - Patrick Koppenburg + - Now add StandardDiMuon to StandardIntermediate + +! 2009-07-09 - Rob Lambert + - Add StdLooseDiMuon to StandardDiMuon + +! 2009-07-08 - Chris Jones + - Update Track selection to make it easy for users to re-define the default + cuts in their DaVinci.py options files, e.g. :- + + from CommonParticles.Utils import DefaultTrackingCuts + DefaultTrackingCuts().Cuts = { } # Make default no cuts + DefaultTrackingCuts().Types = ["Long"] + +! 2009-07-07 - Rob Lambert + - Added a StdLooseDiMuon. Cuts are:- + Vtx Chi^2 / d.o.f. < 64 + ADAMASS(J/Psi) < 3000*MeV + - Modified StdLooseDetachedKstar, loosened cut: + Vtx Chi^2 / d.o.f. < 36 -> **64** + +! 2009-07-06 - Patrick Koppenburg + - Remove all .PhysDesktop + - Increment to v6r0 + +! 2009-07-01 - Chris Jones + - Add loose(ish) track selection cuts to all Standard charged Particles. + Cuts are :- + Chi^2 / d.o.f. < 10 + Likilihood > -100 + CloneDist > -1e10 + GhostProb < 0.99 + Current cuts are just a suggestion (motivated by those used in the RICH + reconstruction) and included as a starting point for discussion with the + physics working groups. + +!========================== CommonParticles v5r4 2009-07-02 =================== + +! 2009-06-29 - Greig Cowan + - Added vertex chi2 cut to StdLooseJpsi2MuMu and StdLoosePhi2KK. + +! 2009-06-28 - Greig Cowan + - Removed StdLooseUnbiasedPhi2KK. Added StdLooseDetachedPhi with K IP cut. New + StdLoosePhi2KK only has upper mass window on the phi. New StdLooseJpsi2MuMu + only has mass window. StdLooseKstar added to be compatible with beta_s + roadmap Bd2JspiKstar selection. Appropriate stripping and ccbar selections + have been updated to use these particles and have been successfully tested. + +!========================== CommonParticles v5r3 2009-06-23 =================== +! 2009-06-12 - Patrick Koppenburg + - Adapt NoPIDs options not to use obsolete options UseDownstreamTracks + and similar. Requires tag pkoppenb_20090612 of ParticleMaker. + - Increment to v5r3 + +!========================== CommonParticles v5r2 2009-06-03 ================== + +! 2009-05-26 - Greig Cowan + - Using StdNoPIDsDownPions for the KsDD. + +! 2009-05-21 - Greig Cowan + - Reverted StdLooseJpsi2MuMu to only make the loose Jpsi's. The FilterDesktop code + for the lifetime unbiased Jpsi has been moved into it's own file: + StdLTUnbiasedJpsi2MuMu.py. This particle has been added to StandardJpsi.py. The + lifetime unbiased selection is based on the one in described in LHCb-2009-025 + and the beta_s roadmap. + +! 2009-05-21 - Vanya BELYAEV + - StdLooseJpsi2MuMu + + fix missing filterDesktop + fin invalid usage of "updateDoD" + +! 2009-05-21 - Patrick Koppenburg + - Removed StdLooseDs from StandardIntermediate + +! 2009-05-20 - V. Gligorov + - Removed the obsolete StdLooseDs.py selection. This has been entirely superseeded + by StdLooseDplus.py because there is no good reasons for different cuts between + the charged D and Ds at this loose level. The mass window is large enough to accomodate + both, as described in the log entry below. If your selection is broken, just switch + to StdLooseDplus. You will also need to change the Ds to a D+ in your decay + descriptors. + +! 2009-05-20 - V. Gligorov + - Updated the cuts for the standard D0 to bring it into line with what will be + needed in the stripping. Added a track chi2/ndof cut of 10 to help with ghosts, + loosened the PT cut to 250 MeV on the final state daughters, and made the mass window + run from 100 MeV above the Ds mass (to help with background estimation) to + 100 MeV below the D0 mass (for the crystal ball). + - Fixed a bug in StdLooseDplus which meant the data on demand service was not being + updated properly. + - Updated the cuts in StdLooseDplus to bring them into line with StdLooseD0. Mass window + runs from 200 MeV below the Ds mass to 100 MeV above it. + +!========================== CommonParticles v5r1 2009-05-11 ================== + +! 2009-04-24 - Patrick Koppenburg + - More bug fixes + +! 2009-04-23 - Patrick Koppenburg + - Fix DC06 particles for further changes in ParticleMaker + - Fix standard particles + +! 2009-04-22 - Patrick Koppenburg + - Second step : updated the new particles in python + - Increment to v5r1 + +! 2009-04-21 - Patrick Koppenburg + - First step to adapt to new ParticleMaker : DC06 done. + +!========================== CommonParticles v5r0p1 2009-04-08 ================ + +! 2008-04-03 - Olivier Deschamps + - adapt options and python to change in calo ParticleMaker (property name changes for pi0Makers) + +! 2009-03-25 - Patrick Koppenburg + - Bug fix in StdLooseD02HH : All states except D0->Kpi were called Standard + instead of Std. + +!========================== CommonParticles v5r0 2009-03-01 ================== + +! 2009-02-26 - Patrick Koppenburg for Alessio Sarti + - Added down pions and protons + +! 2009-02-24 - Patrick Koppenburg + - PhysDesktop() -> PhysDesktop + +! 2009-02-18 - Patrick Koppenburg + - Move all intermediate states to python + - They are now based on Hlt2, not DC06 anymore + - Most of this is untested + - Removed all options/Standard*.opts + - Removed options/StandardOptions.py (requires latest version of AnalysisConf) + - Keep only DC06 stuff in options/ + - options/ directory declared obsolete. Do not edit. + - Increment to v5r0 + +!========================== CommonParticles v4r2 2009-01-05 ================== + +! 2009-01-15 - Vanya BELYAEV + + - The first attempt to provide 'configurables' for standard particles. + all modules configurables are available in python/CommonParticles directory. + + Basic: + + StdLoosePions + StdLooseKaons + StdLooseMuons + StdLooseProtons + StdLooseElectrons + + StdTightPions + StdTightKaons + StdTightMuons + StdTightProtons + StdTightElectrons + + StdNoPIDsPions + StdNoPIDsKaons + StdNoPIDsMuons + StdNoPIDsProtons + StdNoPIDsElectrons + + StdLoosePhotons + StdLooseCnvPhotons + StdLooseAllPhotons + + Collections: + + StandardPions + StandardKaons + StandardMuons + StandardProtons + StandardElectrons + StandardPhotons + StandardBasicCharged + StandardBasicNeutral + StandardBasic + + + The usage is fairly trivial, e.g.: + + import CommonParticles.StdLoosePions + + or: + + import CommonParticles.StandardMuons + + or: + + import CommonParticles.StandardBasic + + + The loaded content could always be inspected using: + + from CommonParticles.Utils import locationsDoD + print locationsDoD() + + Also one can always get the actial algorithms(configurables), + which are responsible for the given equipped locations: + + >>> from CommonParticles.Utils import particles + >>> parts = particles() + >>> for location in parts : + ... print 'location :' % location + ... conf = parts[location] + ... print ' configurable: ' % conf.name() + + + Each file can be inspected from the common line: + + python StandardBasicCharged.py + + + cmt/requirments: + + version increment to v4r2 + + +! 2009-01-09 - Patrick Koppenburg for Diego Martinez Santos + - Fixed incorrect comment about loose muon DLL + +! 2008-12-23 - Patrick Koppenburg + - Rename StandardOptions.opts to .py + - Increment to v4r1p3 + +!========================== CommonParticles v4r1p2 2008-11-05 ================= + +! 2008-10-29 - Patrick Koppenburg + - Rename SelresultCorrelations + - Increment to v4r1p2 + +!========================== CommonParticles v4r1p1 2008-09-10 ================= + +! 2008-09-25 - Patrick Koppenburg + - Use OldFilterDesktop where needed + - Increment to v4r1p1 + +!========================== CommonParticles v4r1 2008-09-10 =================== + +! 2008-09-09 - Patrick Koppenburg + - Standard pions : added some more + +!========================== CommonParticles v4r0 2008-08-05 =================== +! 2008-07-11 - Patrick Koppenburg + - Copied all Standard*.opts to StandradDC06*.opts. These are now obsolete + and will not be touched. + - The remaining Standard*.opts can be translated to Standard*.py. + - Increment to v4r0 + +!========================== CommonParticles v3r13 2008-07-11 ================== +! 2008-07-11 - Patrick Koppenburg + - Explicitly declare ByPIDFilterCriterion for FilterDesktop + +!========================== CommonParticles v3r12 2008-04-24 ================== + +! 2008-04-11 - Patrick Koppenburg + - No tabs in options + +! 2008-03-14 - Patrick Koppenburg + - do not print options + +!========================== CommonParticles v3r11 2008-03-06 ================== + +! 2008-03-06 - Juan PALACIOS + - cmt/requirements + . Increase version to v3r11 + +! 2008-02-03 - Vladimir Gligorov + - Added new StdTightD2KPiPi to StandardDplus.opts + +!========================== CommonParticles v3r10 2007-10-25 ================== + +! 2007-10-01 - Patrick Spradlin for Jim Libby + - Added new StdLooseD02KsKPi to StandardD0.opts + +!========================== CommonParticles v3r9 2007-09-24 =================== + +! 2007-09-03 - Patrick Koppenburg + - Moved dilepton for K*MuuMu into StandardJpsi as StdLoosePenguinDimuon + - increment to v3r9 + +!========================== CommonParticles v3r8 2007-03-09 =================== +! 2007-03-08 - Chris Jones + - Some changes to default cuts for Standard basic particles + + Loose electrons - Tighten DLL cut from -5 to -2 + + Tight Muons - Loosen DLL cut from 0 to -3 + +! 2007-03-08 - Patrick Koppenburg + - Correction for StdLooseBiased J/psi -> ee + +! 2007-03-07 - Patrick Koppenburg for Adlene Hicheur + - Updated J/psi->ee + +! 2007-03-05 - Patrick Koppenburg + - Depend on DaVinciKernel, not DaVinciTools + +! 2007-02-23 - Chris Jones + - Minor change to how the Standard Particle DoD sequences are set up + + For each Data-On-Demand entry alter the configuration to run + instead of the required algorithm, a GaudiSequencer. + + By default this GaudiSequencer runs only the original algorithm so + there is no change to the functionality. The reason for this change is it + allows other algorithms to optionally be appended to the end of the + sequencer. + + A new option file is added 'EnableStandardParticleMonitors.opts' which for each + of the standard particle sequences appends a monitor algorithm that produces some + basic performance monitoring. + +! 2007-02-17 - Patrick Koppenburg + - Correct many typos + +! 2007-02-15 - P. Koppenburg + - opitons/StandardDs.opts + . Correct typo + +! 2007-02-05 - P. Koppenburg + - opitons/StandardDs.opts + . Remove flight distance FC. + +!========================== CommonParticles v3r7 2007-02-02 =================== + +! 2007-02-02 - Juan PALACIOS + - opitons/StandardKstar.opts + . Fix bug. Kazu's changes had managed to comment out StdLooseKstar. + +! 2007-01-31 - Juan PALACIOS for Kazu Akiba + - options/StandardKstar.opts + . Add StdTightKstar standard particle + +! 2007-01-30 - Juan PALACIOS + - options/StandardMuons.opts + . Fix bug in StdTightMuons TrackSelector + +! 2007-01-25 - Cristina Lazzeroni + - options/StandardKs.opts + . Position cuts removed, Chi2 and IPS and Pt cuts changed. + +! 2007-01-25 - Juan PALACIOS for Cristina Lazzeroni + - options/StandardD0.opts + . Some cut tightening. + +! 2007-01-23 - Juan PALACIOS + - options/StandardOptions.opts + . Add StandardMergedPi0s.opts and StandardResolvedPi0s.opts + +! 2007-01-16 - Juan PALACIOS + - Remove src/CommonParticles_load.cpp and _dll.cpp + +! 2007-01-16 - P. Koppenburg + - options/StandardD0.opts + . Apply Pt cut before vertex fit not after. + . increment to v3r7 + +!========================== CommonParticles v3r6 2007-01-08 =================== + +! 2006-12-22 - Juan Palacios for Andy Powell + + - options/StandardD0.opts + . New D0 types: + Replace StdLooseD02KKPiPi for StdLooseD02KKPiPiNoCC and + StdLooseD02KPiPiPi for StdLooseD02KPiPiPiCA. + Remove StdLooseD02KPiPiPiDCS. + + - cmt/requirements + . Increase version to v3r6. + +! 2006-12-22 - Olivier Deschamps + - Apply an (temporary) correction on Brem. energy + +! 2006-12-12 - Jan Amoraal + - Relax Jpsi VChi2 cut, from 6 -> 15, for Flavour Tagging WG + +! 2006-12-12 - Juan PALACIOS + + - options/StandardElectrons.opts + . Remove AddBrem @to-dos. + +!========================== CommonParticles v3r5 2006-12-07 =================== + +! 2006-12-07 - Juan PALACIOS + - re-tag as v3r5 + +! 2006-12-05 - Jan Amoraal + - Removed dll cut in StdUnbiasedHeavyDimuon in StandardJpsi.opts + +! 2006-12-07 - Chris Jones + - Update syntax for combined DLL cuts - 'X-Y' -> 'CombDLL(X-Y)' + +!========================== CommonParticles v3r5 2006-12-06 =================== + +! 2006-12-05 - Juan PALACIOS + - cmt/requirements + . Increment version to v3r5 + +! 2006-11-28 - Olivier Deschamps + - fix StandardResolvedPi0s.optsS & standardMergedPi0s.opts +! 2006-11-28 - Juan PALACIOS + - options/ + add StandardResolvedPi0s.optsS & standardMergedPi0s.opts + update StandardPhotons.opts + +!========================== CommonParticles v3r4 2006-11-16 =================== + +! 2006-11-14 - Juan PALACIOS + + - cmt/requirements + . Increment version to v3r4 + + - options/StandardMuons.opts + . Remove mu-pi DLL cut for StdLooseMuons. + +!========================== CommonParticles v3r3 2006-10-24 =================== + +! 2006-10-20 - Juan PALACIOS + + - options/StandardElectrons.opts + . Fix bug in StdTightElectrons track selection (found by Olivier Deschamps). + + - cmt/requirements + . Increase version number to v3r3 + +! 2006-10-13 - Juan PALACIOS + + - options/StandardProtons.opts, StandarsPions.opts + . Replace "VTT" by "Upstream" in track types. + +! 2006-10-12 - Juan PALACIOS + - options/StandardProtons.opts + . Adapt to new protoparticle filter syntax. + - options/StandardDplus.opts + . Fix syntax error. + +!========================== CommonParticles v3r2 2006-10-04 =================== + +! 2006-10-04 - J. Palacios + - Fix bug in StandardKaons.opts + +! 2006-10-04 - P. Koppenburg + - New D0->4H by Andy Powell + +! 2006-09-29 - Juan PALACIOS + Increase version number to v3r2 + +! 2006-09-18 - Juan PALACIOS + - options/StandardPions.opts + . Add StdTightPions to DataOnDemandSvc. + +! 2006-09-06 - Olivier Deschamps + - Remove obsolete Calo stuff (XXpi0Alg) + - Update the StandardPhoton.opts + + +! 2006-08-18 - Juan PALACIOS + - options/StandardKs.opts + . Fix syntax error (extra trailing comma) + +!========================== CommonParticles v3r1 2006-07-28 =================== + +! 2006-07-18 - Juan PALACIOS + - options/StandardJpsi.opts + . Adapt DLL cuts to new ProtoParticleFilter scheme. + +!========================== CommonParticles v3r0 2006-07-07 =================== + +! 2006-07-11 - J. Palacios + options/StandardMuons.opts: Fix bug in StdTightMuons + +! 2006-06-28 - J. Palacios + - cmt/requirements + . Increase version number to v3r0 + +! 2006-06-28 - J. Palacios + - options + . new files for standard electrons, muons, pions, kaons, protons, and + photons a la DC06. + . StandardParticles.opts now includes these files. + . Photons not ready yet so commented out. + . Electrons missing AddBremPhoton functionality + + + Added: + + options/StandardElectrons.opts + options/StandardKaons.opts + options/StandardMuons.opts + options/StandardParticles.opts + options/StandardPhotons.opts + options/StandardPions.opts + options/StandardProtons.opts + + +! 2006-06-27 - J. Palacios + First attempt to make a DC06 version. + - cmt/requirements: remove use of RecoTools and library building. + +! 2006-05-20 - P. Koppenburg for Miriam Calvo + - options/StandardJpsi.opts + . Added J/psi->ee + - options/StandardParticles.opts + . Add Bremsstrahlung photon + . Remove hybrid mesons, leptons, hadrons... + +!========================== CommonParticles v2r2 2006-05-29 =================== +! 2006-05-24 - P. Koppenburg for Eric Conte + - options/StandardLambda.opts + . Standard Lambda + +! 2006-05-22-3 - P. Koppenburg for Eric Conte + - options/StandardParticles.opts + . Added Downstream and VTT protons + +! 2006-05-22-3 - P. Koppenburg for Jan Anoraal + - options/StandardJpsi.opts + . New unbiased J/psi and Standard heavy dimuon + +! 2006-05-22-3 - P. Koppenburg for Jeremie Borel + - options/StandardDs.opts + . Standard Ds + +! 2006-05-20 - V. Gligorov + - options/StandardD0.opts + . Restored pt cut on D0 to 1000 MeV + +! 2006-05-19 - P. Koppenburg + - options/DVTestStandardParticles.opts + - options/StandardOptions.opts + . Added StandardDplus + - options/StandardKstar.opts + . Window widened to +/-300MeV + +! 2006-05-19 - V. Gligorov + - options/StandardDplus.opts added + - options/StandardD0.opts + . Pt cuts loosened + - options/StandardDstar.opts + . sIPS cut on slow pion loosened + . Pt cuts loosened + +! 2006-05-18 - P. Koppenburg for I. Belyaev + - options/StandardKstar.opts + - options/StandardPhi.opts + . Loosened. Removed Pt cuts. + - options/StandardRho0.opts + . New options. + +! 2006-05-18 - P. Koppenburg + - options/StandardKs.opts + . Added options by Cristina Lazzeroni + - options/StandardD0.opts + . Added D0->KsPiPi and KsKK by Cristina Lazzeroni + - options/StandardParticles.opts + . Added StdLooseDownstreamPions for Ks + - options/DVTestStandardParticles.opts + . Test D0->KsHH + +!========================== CommonParticles v2r1 2006-04-28 =================== +! 2006-04-28 - P. Koppenburg + - options/StandardDstar.opts + . Bug fix: Chi2 and mass difference were cut actually ignored + . Change mass difference cut from 10 to 20 MeV + +!========================== CommonParticles v2r0 2006-02-03 =================== +! 2006-01-31 - P. Koppenburg + - options/MergedPi0Alg.opts + - options/ResolvedPi0Alg.opts + - options/ProducePairPhotons.opts + . Make algorithms "on-demand" + +! 2006-01-31 - P. Koppenburg and Vanya Belyaev + First commit of standard on-demand particles. To be reviewed by the + Physics WG. + - options/StandardParticles.opts + . Particles "on demand" with standard PID cuts, originally by Vanya + - options/StandardD0.opts + - options/StandardDs.opts + - options/StandardDstar.opts + - options/StandardJpsi.opts + - options/StandardKstar.opts + - options/StandardPhi.opts + . Some intermediate states with just-tighter-than-HLT cuts + - options/StandardOptions.opts + . Options to include them all + - options/DVTestStandardParticles.opts + . File to test all this + +!========================== CommonParticles v1r5p3 2004-09-16 =================== +! 2004-09-02 - P. Koppenburg + - src/<someAlgorithms>.cpp + . Remove getInput that is not in PhysDesktop anymore. +!========================== CommonParticles v1r5p2 2004-08-03 =================== +! 2004-07-23 - P. Koppenburg + - cmt/requirements + . Don't use but import AIDA +!========================== CommonParticles v1r5p1 2004-07-22 =================== +! 2004-07-08 - P. Koppenburg + - options/ProducePairPhotons.opts + . Use CombinedParticleMaker + +!==================== CommonParticle v1r5 2004-06-04 ======================== +! 2004-06-03 - P. Koppenburg for O. Deschamps + - MergedPi0Alg.opts + . MergedPi0Alg.ParMas={ 1.008 , 0.0658E-03 , 0.1276E-04 }; + because of new calo calibration + +! 2004-05-11 - P. Koppenburg for O. Deschamps + - MergedPi0Alg.opts + . MergedPi0Alg.ParMas={ 1.0000 , 0.0653E-03 , 0.1267E-04 }; + because of new calo calibration + +!==================== CommonParticle v1r4 2004-05-05 ======================== +! 2004-04-28 - R.Beneyton + - ProducePairPhoton (h/src/opts): update to new DVAlg + . getInput, loadtools in code with flag off + . DecayDescriptor, Outputlocation in opts files + +! 2004-04-28 - P.Koppenburg + - src/MergedPi0Alg.cpp + . SetFilterPassed(true). + - options/ResolvedPi0Alg.opts + - src/ResolvedPi0Alg.cpp + - src/ResolvedPi0Alg.h + . New version with modified options + +!==================== CommonParticle v1r2 2004-04-20 ======================== +! 2004-04-22 - P.Koppenburg for F. Machefer + - Added ResolvedPi0Alg and MergedPi0Alg + +!==================== CommonParticle v1r1 2004-04-20 ======================== +! 2004-04-16 - Richard Beneyton + - update ProducePairPhotons for combinedparticlemaker (check id) + +!==================== PhysSel v1r0 2003-12-11 ============================= +! 2003-11-07 - Richard Beneyton + - First version of the package, with ProducePairPhotons alg. + - Note that the package requires Rec/RecoTools v1r1 + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py new file mode 100755 index 000000000..bd384b092 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardBasic.py,v 1.4 2009-10-09 12:41:27 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardBasic.py +# configuration file for 'Standard Basic' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Basic' particles +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StandardBasicCharged import * +_locations.update ( locations ) + +from CommonParticles.StandardBasicNeutral import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasicCharged.py b/Phys/CommonParticles/python/CommonParticles/StandardBasicCharged.py new file mode 100755 index 000000000..b2ae2ae08 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasicCharged.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardBasicCharged.py,v 1.1 2009-01-15 14:22:14 ibelyaev Exp $ +# ============================================================================= +## @file CommonParticles/StandardBasicCharged.py +# configuration file for 'Standard BasicCharged' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Basic Charged' particles +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StandardPions import * +_locations.update ( locations ) + +from CommonParticles.StandardKaons import * +_locations.update ( locations ) + +from CommonParticles.StandardMuons import * +_locations.update ( locations ) + +from CommonParticles.StandardElectrons import * +_locations.update ( locations ) + +from CommonParticles.StandardProtons import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py b/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py new file mode 100755 index 000000000..7699538b0 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardBasicNeutral.py,v 1.3 2010-01-06 11:04:12 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardBasicNeutral.py +# configuration file for 'Standard Basic Neutral' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Basic Neutral' particles +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StandardPhotons import * +_locations.update ( locations ) + +from CommonParticles.StandardPi0 import * +_locations.update ( locations ) + +from CommonParticles.StandardEta import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardD0.py b/Phys/CommonParticles/python/CommonParticles/StandardD0.py new file mode 100755 index 000000000..de3781767 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardD0.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardD0.py,v 1.2 2009-12-14 11:45:32 poluekt Exp $ +# ============================================================================= +## @file CommonParticles/StandardD0.py +# configuration file for 'Standard D0' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard D0' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseD02KsHH import * +_locations.update ( locations ) + +from CommonParticles.StdLooseD02HH import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseD02HH import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py new file mode 100755 index 000000000..894707d8c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardDiElectron.py,v 1.1 2009-12-09 16:58:47 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLoose.py +# configuration file for 'Standard Loose DiElectron' +# @author Patrick Koppenburg +# @date 2009-12-08 +# ============================================================================= +""" +Configuration file for 'Standard Loose DiElectron' +""" +__author__ = "Rob Lambert" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +from Gaudi.Configuration import * + +## ============================================================================ +## create the algorithm + +_locations = {} + +from CommonParticles.StdLooseDiElectron import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## configure Data-On-Demand service +#locations = updateDoD ( StdLoose ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StandardDiMuon.py new file mode 100755 index 000000000..a3efdcd6a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardDiMuon.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardDiMuon.py,v 1.4 2010-01-26 13:43:38 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLoose.py +# configuration file for 'Standard Loose DiMuon' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose DiMuon' +""" +__author__ = "Rob Lambert" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +from Gaudi.Configuration import * + +## ============================================================================ +## create the algorithm + +_locations = {} + +from CommonParticles.StdLooseDiMuon import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseDiMuon import * +_locations.update ( locations ) + +from CommonParticles.StdLooseDiMuonSameSign import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## configure Data-On-Demand service +#locations = updateDoD ( StdLoose ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDplus.py b/Phys/CommonParticles/python/CommonParticles/StandardDplus.py new file mode 100755 index 000000000..91413b3e3 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardDplus.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardDplus.py,v 1.2 2009-12-14 11:45:32 poluekt Exp $ +# ============================================================================= +## @file CommonParticles/StandardDplus.py +# configuration file for 'Standard D+' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard D+' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseDplus import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseDplus import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDstar.py b/Phys/CommonParticles/python/CommonParticles/StandardDstar.py new file mode 100755 index 000000000..ca18aea8e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardDstar.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardDstar.py,v 1.3 2010-01-18 10:08:49 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StandardDstar.py +# configuration file for 'Standard D*' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard D*' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseDstarWithD2HH import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseDstarWithD2HH import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py new file mode 100755 index 000000000..e685b7af8 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardElectrons.py,v 1.1 2009-01-15 14:22:14 ibelyaev Exp $ +# ============================================================================= +## @file CommonParticles/StandardElectrons.py +# configuration file for 'Standard Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Electrons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdNoPIDsElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdTightElectrons import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardEta.py b/Phys/CommonParticles/python/CommonParticles/StandardEta.py new file mode 100755 index 000000000..b3cb6e8e0 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardEta.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardEta.py,v 1.1 2010-01-06 11:04:12 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardEta.py +# configuration file for 'Standard Eta' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Eta' +""" +__author__ = "Patrick Koppenburg Patrick.Koppenburg@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseResolvedEta import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py new file mode 100755 index 000000000..4d84e266e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardIntermediate.py,v 1.8 2009-12-14 11:45:32 poluekt Exp $ +# ============================================================================= +## @file CommonParticles/StandardIntermediates.py +# configuration file for 'Standard Intermediate particles +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Intermediate' particles +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.8 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StandardV0 import * +_locations.update ( locations ) +from CommonParticles.StandardKstar import * +_locations.update ( locations ) +from CommonParticles.StandardRho import * +_locations.update ( locations ) +from CommonParticles.StandardPhi import * +_locations.update ( locations ) +from CommonParticles.StandardD0 import * +_locations.update ( locations ) +from CommonParticles.StandardDplus import * +_locations.update ( locations ) +from CommonParticles.StandardDstar import * +_locations.update ( locations ) +from CommonParticles.StandardJpsi import * +_locations.update ( locations ) +from CommonParticles.StandardDiMuon import * +_locations.update ( locations ) +from CommonParticles.StandardDiElectron import * +_locations.update ( locations ) +from CommonParticles.StandardLambdac import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardJpsi.py b/Phys/CommonParticles/python/CommonParticles/StandardJpsi.py new file mode 100755 index 000000000..0dafe0aea --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardJpsi.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardJpsi.py,v 1.4 2010-09-01 14:16:42 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StandardJpsi.py +# configuration file for 'Standard Jpsi' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard Jpsi' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseJpsi2MuMu import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseJpsi2MuMu import * +_locations.update ( locations ) + +from CommonParticles.StdLooseJpsi2ee import * +_locations.update ( locations ) + +from CommonParticles.StdLTUnbiasedJpsi2MuMu import * +_locations.update ( locations ) + +from CommonParticles.StdMassConstrainedJpsi2MuMu import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py new file mode 100755 index 000000000..07620a3ec --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardKaons.py,v 1.2 2010-06-03 10:31:18 yamhis Exp $ +# ============================================================================= +## @file CommonParticles/StandardKaons.py +# configuration file for 'Standard Kaons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Kaons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdNoPIDsKaons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseKaons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseDownKaons import * +_locations.update ( locations ) + +from CommonParticles.StdTightKaons import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKstar.py b/Phys/CommonParticles/python/CommonParticles/StandardKstar.py new file mode 100755 index 000000000..f9093c0fd --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardKstar.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardKstar.py,v 1.2 2010-01-22 13:04:01 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardKstar.py +# configuration file for 'Standard K*' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard K*' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseKstar import * +_locations.update ( locations ) +from CommonParticles.StdVeryLooseDetachedKstar import * +_locations.update ( locations ) +from CommonParticles.StdLooseDetachedKstar import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py b/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py new file mode 100755 index 000000000..e53953183 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardLambdac.py,v 1.2 2010-09-03 20:59:11 roldeman Exp $ +# ============================================================================= +## @file CommonParticles/StandardDplus.py +# configuration file for 'Standard Lambda_c' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard Lambda_c' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseLambdac import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseLambdac import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py new file mode 100755 index 000000000..6f025fa34 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardMuons.py,v 1.2 2009-10-08 12:37:06 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardMuons.py +# configuration file for 'Standard Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdNoPIDsMuons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseMuons import * +_locations.update ( locations ) + +from CommonParticles.StdVeryLooseMuons import * +_locations.update ( locations ) + +from CommonParticles.StdTightMuons import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPhi.py b/Phys/CommonParticles/python/CommonParticles/StandardPhi.py new file mode 100755 index 000000000..1da2d72fa --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardPhi.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardPhi.py,v 1.1 2009-10-09 12:39:26 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardPhi.py +# configuration file for 'Standard Phi' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard Phi' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLoosePhi import * +_locations.update ( locations ) +from CommonParticles.StdLooseDetachedPhi import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py b/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py new file mode 100755 index 000000000..8981f4365 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardPhotons.py,v 1.1 2009-01-15 14:22:14 ibelyaev Exp $ +# ============================================================================= +## @file CommonParticles/StandardPhotons.py +# configuration file for 'Standard Photons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Photons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLoosePhotons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseCnvPhotons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseAllPhotons import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPi0.py b/Phys/CommonParticles/python/CommonParticles/StandardPi0.py new file mode 100755 index 000000000..cc7421b0a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardPi0.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardPi0.py,v 1.1 2009-02-18 15:29:29 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardPi0.py +# configuration file for 'Standard Pi0' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Pi0' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseMergedPi0 import * +_locations.update ( locations ) + +from CommonParticles.StdLooseResolvedPi0 import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPions.py b/Phys/CommonParticles/python/CommonParticles/StandardPions.py new file mode 100755 index 000000000..1276e47b2 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardPions.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardPions.py,v 1.3 2009-10-08 12:37:06 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardPions.py +# configuration file for 'Standard Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdNoPIDsPions import * +_locations.update ( locations ) + +from CommonParticles.StdNoPIDsDownPions import * +_locations.update ( locations ) + +from CommonParticles.StdNoPIDsUpPions import * +_locations.update ( locations ) + +from CommonParticles.StdLoosePions import * +_locations.update ( locations ) + +from CommonParticles.StdTightPions import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardProtons.py b/Phys/CommonParticles/python/CommonParticles/StandardProtons.py new file mode 100755 index 000000000..571b87392 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardProtons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardProtons.py,v 1.2 2009-02-26 16:53:14 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardProtons.py +# configuration file for 'Standard Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Protons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdNoPIDsProtons import * +_locations.update ( locations ) + +from CommonParticles.StdNoPIDsDownProtons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseProtons import * +_locations.update ( locations ) + +from CommonParticles.StdTightProtons import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardRho.py b/Phys/CommonParticles/python/CommonParticles/StandardRho.py new file mode 100755 index 000000000..6a31d650c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardRho.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardRho.py,v 1.1 2009-10-09 12:39:26 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardRho.py +# configuration file for 'Standard Rho' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard Rho' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseRho0 import * +_locations.update ( locations ) +from CommonParticles.StdLooseRhoPlus import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardV0.py b/Phys/CommonParticles/python/CommonParticles/StandardV0.py new file mode 100755 index 000000000..db335e192 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardV0.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardV0.py,v 1.1 2009-10-09 12:39:26 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardV0.py +# configuration file for 'Standard V0' +# @author Patrick Koppenburg +# @date 2009-02-28 +# ============================================================================= +""" +Configuration file for 'Standard V0' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseKs import * +_locations.update ( locations ) + +from CommonParticles.StdLooseLambda import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py new file mode 100644 index 000000000..601773e82 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLTUnbiasedJpsi2MuMu.py,v 1.2 2009-06-28 12:02:54 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdLTUnbiasedJpsi2MuMu.py +# configuration file for 'Standard lifetime unbiased Jpsi2MuMu' +# @author Greig Cowan +# @date 2009-05-21 +# ============================================================================= +""" +Configuration file for 'Standard lifetime unbiased Jpsi2MuMu' +""" +__author__ = "Greig Cowan" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLTUnbiasedJpsi2MuMu' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * + +## ============================================================================ +StdLTUnbiasedJpsi2MuMu = FilterDesktop("StdLTUnbiasedJpsi2MuMu") +StdLTUnbiasedJpsi2MuMu.InputLocations =["StdLooseJpsi2MuMu"] +StdLTUnbiasedJpsi2MuMu.Code = " (MINTREE('mu+'==ABSID, PT) > 500.*MeV)" \ + "& (MINTREE('mu+'==ABSID, PIDmu) > -10.0)" \ + "& (MAXTREE('mu+'==ABSID, PIDK) < 10.0)" \ + "& (ADMASS('J/psi(1S)') < 50.*MeV)" \ + "& (PT > 1000.*MeV)" \ + "& (VFASPF(VCHI2) < 6.0)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLTUnbiasedJpsi2MuMu ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py new file mode 100755 index 000000000..7ad84adfc --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseAllPhotons.py,v 1.2 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseAllPhotons.py +# configuration file for 'Standard Loose Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose All Photons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLooseAllPhotons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import PhotonMakerAlg +from Configurables import PhotonMaker + +from GaudiKernel.SystemOfUnits import MeV + +from CommonParticles.Utils import * + + +## create the algorithm +algorithm = PhotonMakerAlg ( 'StdLooseAllPhotons' , + DecayDescriptor = 'Gamma' ) + +# configure desktop&particle maker: +algorithm.addTool ( PhotonMaker , name = 'PhotonMaker' ) +photon = algorithm.PhotonMaker +photon.ConvertedPhotons = True +photon.UnconvertedPhotons = True +photon.PtCut = 200 * MeV + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseAllPhotons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py new file mode 100755 index 000000000..e68416089 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseCnvPhotons.py,v 1.2 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseCnvPhotons.py +# configuration file for 'Standard Loose Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Converted Photons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLooseCnvPhotons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import PhotonMakerAlg +from Configurables import PhotonMaker + +from GaudiKernel.SystemOfUnits import MeV + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = PhotonMakerAlg ( 'StdLooseCnvPhotons' , + DecayDescriptor = 'Gamma' ) + +# configure desktop&particle maker: +algorithm.addTool ( PhotonMaker , name = 'PhotonMaker' ) +photon = algorithm.PhotonMaker +photon.ConvertedPhotons = True +photon.UnconvertedPhotons = False +photon.PtCut = 200 * MeV + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseCnvPhotons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py new file mode 100755 index 000000000..636e32edc --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseD02HH.py,v 1.8 2009-07-10 03:05:14 gligorov Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseD02HH.py +# configuration file for 'Standard Loose D0 -> HH' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose D0 -> HH' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.8 $" +# ============================================================================= +__all__ = ( + 'StdLooseD02KPi' , + 'StdLooseD02PiPi' , + 'StdLooseD02KK' , + 'StdLooseD02KPiDCS' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseD02KPi = CombineParticles ( 'StdLooseD02KPi' ) + +StdLooseD02KPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" + +StdLooseD02KPi.DaughtersCuts = { "K+" : "(PT>250*MeV) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)", + "pi+" : "(PT>250*MeV) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"} + +#for the mass window, need 100 MeV above the Ds mass for clean background estimation, but only need +#~100 MeV below since the lower mass sideband will be for the crystal ball only. + +StdLooseD02KPi.CombinationCut = "(APT>1*GeV) & (ADAMASS('D0')<200*MeV) & (ADOCACHI2CUT(20, ''))" +StdLooseD02KPi.MotherCut = "(VFASPF(VCHI2)<10) & (M > 1760*MeV)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseD02KPi ) + +## ============================================================================ +## PiPi +StdLooseD02PiPi = StdLooseD02KPi.clone("StdLooseD02PiPi") +StdLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" +StdLooseD02PiPi.InputLocations = [ "StdNoPIDsPions" ] + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseD02PiPi ) + +## ============================================================================ +## KK +StdLooseD02KK = StdLooseD02KPi.clone("StdLooseD02KK") +StdLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" +StdLooseD02KK.InputLocations = [ "StdNoPIDsKaons" ] + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseD02KK ) + +## ============================================================================ +## Doubly Cabibbo suppressed +StdLooseD02KPiDCS = StdLooseD02KPi.clone("StdLooseD02KPiDCS") +StdLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" +StdLooseD02KPiDCS.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseD02KPiDCS ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py new file mode 100755 index 000000000..88d4f6ac7 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py @@ -0,0 +1,71 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseD02KsHH.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseD02KsHH.py +# configuration file for 'Standard Loose D0 -> KsHH' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose D0 -> KsHH' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLooseD02KsPiPi' , + 'StdLooseD02KsKK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +########################################################################################## +# D0 -> Ks Pi Pi +# +StdLooseD02KsPiPi = CombineParticles("StdLooseD02KsPiPi") + +StdLooseD02KsPiPi.InputLocations = [ "StdLoosePions", "StdLooseKsLL" ] +StdLooseD02KsPiPi.DecayDescriptor = "[D0 -> KS0 pi+ pi-]cc" + +StdLooseD02KsPiPi.DaughtersCuts = { "pi+" : "(PT>400*MeV)", + "KS0" : "(PT>1*GeV)"} +StdLooseD02KsPiPi.CombinationCut = "(ADAMASS('D0')<80*MeV) & (APT>1800*MeV)" +StdLooseD02KsPiPi.MotherCut = "(VFASPF(VCHI2/VDOF)<10) & (MIPCHI2DV(PRIMARY)>1)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseD02KsPiPi ) + + +########################################################################################## +# D0 -> Ks K K is a clone of Ks Pi Pi +# +StdLooseD02KsKK = StdLooseD02KsPiPi.clone("StdLooseD02KsKK") + +StdLooseD02KsKK.InputLocations = [ "StdLooseKaons", "StdLooseKsLL" ] +StdLooseD02KsKK.DecayDescriptor = "[D0 -> KS0 K+ K-]cc" + +StdLooseD02KsKK.DaughtersCuts = { "K+" : "(PT>300*MeV)", + "KS0" : "(PT>800*MeV)" } +StdLooseD02KsKK.CombinationCut = "(ADAMASS('D0')<80) & (APT>1500*MeV)" +StdLooseD02KsKK.MotherCut = "(VFASPF(VCHI2/VDOF)<10) & (MIPCHI2DV(PRIMARY)>0.49)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseD02KsKK ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py new file mode 100644 index 000000000..6b0412606 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py @@ -0,0 +1,23 @@ +""" +Configuration file for Standard Loose Kstar2Kpi +""" + +__author__ = 'Diego Martinez Santos, P. Koppenburg' +__date__ = '29/06/2009' + + +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdLooseDetachetKst2Kpi # +########################### + +StdLooseDetachedKst2Kpi = FilterDesktop("StdLooseDetachedKst2Kpi") +StdLooseDetachedKst2Kpi.InputLocations = ["StdVeryLooseDetachedKst2Kpi"] +StdLooseDetachedKst2Kpi.Code = "(MIPCHI2DV(PRIMARY)> 2.25)" +locations = updateDoD(StdLooseDetachedKst2Kpi) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py new file mode 100755 index 000000000..0edd8eeb4 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py @@ -0,0 +1,43 @@ +##!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDetachedPhi.py,v 1.2 2009-07-10 15:19:54 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDetachedPhi2KK.py +# configuration file for 'Standard Loose Detached' +# @author Greig Cowan +# @date 2009-06-23 +# ============================================================================= +""" +Configuration file for 'Standard Loose Detached (i.e., cut on K IP) Phi2KK' +""" +__author__ = "Greig Cowan" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLooseDetachedPhi2KK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseDetachedPhi2KK = CombineParticles ("StdLooseDetachedPhi2KK") +StdLooseDetachedPhi2KK.InputLocations = ["StdLooseKaons"] +StdLooseDetachedPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" +StdLooseDetachedPhi2KK.DaughtersCuts = {"K+": "(MIPCHI2DV(PRIMARY) > 4.)"} +StdLooseDetachedPhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseDetachedPhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDetachedPhi2KK ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py new file mode 100644 index 000000000..0d23a754d --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -0,0 +1,33 @@ +""" +Configuration file for Standard Loose DiElectron, very loose for penguins +""" + +__author__ = 'Patrick Koppenburg' +__date__ = '08/12/2009' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdLooseDiElectron # +########################### + +StdLooseDiElectron = CombineParticles("StdLooseDiElectron") +StdLooseDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" +StdLooseDiElectron.InputLocations = ["StdLooseElectrons"] +StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" +locations = updateDoD(StdLooseDiElectron) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py new file mode 100644 index 000000000..6c847ec9e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py @@ -0,0 +1,33 @@ +""" +Configuration file for Standard Loose DiMuon +""" + +__author__ = 'Rob Lambert' +__date__ = '07/07/2009' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdLooseDiMuon # +########################### + +StdLooseDiMuon = CombineParticles("StdLooseDiMuon") +StdLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdLooseDiMuon.InputLocations = ["StdLooseMuons"] +StdLooseDiMuon.CombinationCut = "(ADOCACHI2CUT(30, ''))" +StdLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25)" +locations = updateDoD(StdLooseDiMuon) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py new file mode 100644 index 000000000..d32d56cca --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py @@ -0,0 +1,29 @@ +""" +Configuration file for Standard Loose DiMuon +""" + +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdLooseDiMuonSameSign # +########################### + +StdLooseDiMuonSameSign = CombineParticles("StdLooseDiMuonSameSign") +StdLooseDiMuonSameSign.DecayDescriptor = "[J/psi(1S) -> mu+ mu+]cc" +StdLooseDiMuonSameSign.InputLocations = ["StdLooseMuons"] +StdLooseDiMuonSameSign.CombinationCut = "(ADOCACHI2CUT(30, ''))" +StdLooseDiMuonSameSign.MotherCut = "(VFASPF(VCHI2) < 25)" +locations = updateDoD(StdLooseDiMuonSameSign) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py new file mode 100755 index 000000000..1622f0013 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDownKaons.py +# ============================================================================= +## @file CommonParticles/StdLooseDownKaons.py +# configuration file for 'Standard Loose Down Kaons' +# @author Yasmine Amhis +# @date 2010-06-03 +# ============================================================================= +""" +Configuration file for 'Standard Loose Downstream Kaons' +""" +__author__ = "Yasmine Amhis <yasmine.amhis@epfl.ch> " +__version__ = "" +# ============================================================================= +__all__ = ( + 'StdLooseDownKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker('StdLooseDownKaons', Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm , trackTypes = ['Downstream']) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(k-pi)>'-5.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseDownKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py new file mode 100755 index 000000000..6f4e73c51 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDplus.py,v 1.8 2010-09-09 08:44:42 jpalac Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDplus.py +# configuration file for 'Standard Loose Dplus' +# @author Vladimir Gligorov +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose Dplus' +""" +__author__ = "Vladimir Gligorov" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.8 $" +# ============================================================================= +__all__ = ( + 'StdLooseDplus2KPiPi' , + 'StdLooseDplus2KKPi' , + 'StdLooseDplus2PiPiPi' , + 'StdLooseDplus2KPiPiOppSignPi' , + 'StdLooseDplus2hhh', + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseDplus2KPiPi = CombineParticles ( 'StdLooseDplus2KPiPi' ) + +StdLooseDplus2KPiPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdLooseDplus2KPiPi.DecayDescriptor = "[D+ -> K- pi+ pi+]cc" +StdLooseDplus2KPiPi.DaughtersCuts = { + "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", + "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" + } + +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds + +StdLooseDplus2KPiPi.CombinationCut = "(ADAMASS('D_s+')<200*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50, ''))" +StdLooseDplus2KPiPi.MotherCut = "(VFASPF(VCHI2) < 30 ) & (M < 2070.*MeV) " + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDplus2KPiPi ) + +########################################################################################## +# D+ -> K K Pi is a clone of D+ -> K Pi Pi +# +StdLooseDplus2KKPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KKPi") +StdLooseDplus2KKPi.DecayDescriptor = "[D+ -> K- K+ pi+]cc" +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDplus2KKPi ) +########################################################################################## +# D+ -> 3 pi is a clone of D+ -> K Pi Pi +# +StdLooseDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2PiPiPi") +StdLooseDplus2PiPiPi.InputLocations = [ "StdNoPIDsPions" ] +StdLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDplus2PiPiPi ) +########################################################################################## +# Also need the opposite sign pions mode for the Ds +# +StdLooseDplus2KPiPiOppSignPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KPiPiOppSignPi") +StdLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDplus2KPiPiOppSignPi ) + +StdLooseDplus2hhh = CombineParticles ( 'StdLooseDplus2hhh') +StdLooseDplus2hhh.InputLocations = [ "StdNoPIDsPions" ] +StdLooseDplus2hhh.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" +StdLooseDplus2hhh.DaughtersCuts = { + "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" + } + +StdLooseDplus2hhh.CombinationCut = """( + in_range(1769*MeV, mpipipi , 2069 * MeV) | + in_range(1769*MeV, mKpipi , 2069 * MeV) | + in_range(1769*MeV, mKKpi , 2069 * MeV) | + in_range(1769*MeV, mKpipiDCS , 2069 * MeV) + ) & (APT>1.*GeV) & (ADOCACHI2CUT(50, '')) + """ +StdLooseDplus2hhh.MotherCut = "(VFASPF(VCHI2) < 30 )" +StdLooseDplus2hhh.Preambulo = [ "mpipipi = AWM ('pi-' , 'pi+' , 'pi+' ) " , + "mKpipi = AWM ('K-' , 'pi+', 'pi+' ) " , + "mKKpi = AWM ('K-' , 'K+' , 'pi+' ) " , + "mKpipiDCS = AWM ( 'pi-' , 'K+' , 'pi+' )" ] +## configure Data-On-Demand service +locations = updateDoD (StdLooseDplus2hhh) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py new file mode 100755 index 000000000..34611990a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDstarWithD2HH.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDstarWithD02HH.py +# configuration file for 'Standard Loose Dstar WithD02HH' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose Dstar WithD02HH' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLooseDstarWithD02KPi' , + 'StdLooseDstarWithD02KPiDCS' , + 'StdLooseDstarWithD02PiPi' , + 'StdLooseDstarWithD02KK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseDstarWithD02KPi = CombineParticles ( 'StdLooseDstarWithD02KPi' ) + +StdLooseDstarWithD02KPi.InputLocations = [ "StdLoosePions", "StdLooseD02KPi" ] +StdLooseDstarWithD02KPi.DecayDescriptor = "[D*(2010)+ -> pi+ D0]cc" + +StdLooseDstarWithD02KPi.CombinationCut = "(ADAMASS('D*(2010)+')<50*MeV) & (APT>1250*MeV)" +StdLooseDstarWithD02KPi.MotherCut = "(VFASPF(VCHI2/VDOF)<25) & (M-MAXTREE('D0'==ABSID,M)<165.5)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDstarWithD02KPi ) + +################################################################################ +# D* with Cabibbo-suppressed D0->K+Pi- is a clone of D* with D0->KPi +# +StdLooseDstarWithD02KPiDCS = StdLooseDstarWithD02KPi.clone("StdLooseDstarWithD02KPiDCS") +GaudiSequencer("SeqStdLooseDstarWithD02KPiDCS").Members += [ StdLooseDstarWithD02KPiDCS ] +StdLooseDstarWithD02KPiDCS.InputLocations = [ "StdLoosePions", "StdLooseD02KPiDCS" ] +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDstarWithD02KPiDCS ) + +################################################################################ +# D* with D0->KK is a clone of D* with D0->Kpi +# +StdLooseDstarWithD02KK = StdLooseDstarWithD02KPi.clone("StdLooseDstarWithD02KK") +StdLooseDstarWithD02KK.DecayDescriptor = "[D*(2010)+ -> pi+ D0]cc" +StdLooseDstarWithD02KK.InputLocations = [ "StdLoosePions", "StdLooseD02KK" ] +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDstarWithD02KK ) + +################################################################################ +# D* with D0->PiPi is a clone of D* with D0->KK +# +StdLooseDstarWithD02PiPi = StdLooseDstarWithD02KK.clone("StdLooseDstarWithD02PiPi") +GaudiSequencer("SeqStdLooseDstarWithD02PiPi").Members += [ StdLooseDstarWithD02PiPi ] +StdLooseDstarWithD02PiPi.InputLocations = [ "StdLoosePions", "StdLooseD02PiPi" ] +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDstarWithD02PiPi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py new file mode 100755 index 000000000..8681329b6 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseElectrons.py,v 1.5 2010-06-01 09:41:12 odescham Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseElectrons.py +# configuration file for 'Standard Loose Electrons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Electrons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from Configurables import BremAdder + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +fltr.Selection = [ "RequiresDet='CALO' CombDLL(e-pi)>'-2.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseElectrons = algorithm + +## temporary: +#algorithm.addTool ( BremAdder ) +#brem = algorithm.BremAdder +#brem.BremCor = 1.0 + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py new file mode 100644 index 000000000..c007ff5ac --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseJpsi2MuMu.py,v 1.9 2009-06-29 09:16:49 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseJpsi2MuMu.py +# configuration file for 'Standard Loose Jpsi2MuMu' +# @author Greig Cowan +# @date 2009-06-23 +# ============================================================================= +""" +Configuration file for 'Standard Loose Jpsi2MuMu' +""" +__author__ = "Greig Cowan" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.9 $" +# ============================================================================= +__all__ = ( + 'StdLooseJpsi2MuMu' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseJpsi2MuMu = CombineParticles ("StdLooseJpsi2MuMu") +StdLooseJpsi2MuMu.InputLocations = ["StdLooseMuons"] +StdLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseJpsi2MuMu ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py new file mode 100644 index 000000000..a75bc9fe1 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseJpsi2ee.py,v 1.6 2010-05-21 09:53:29 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseJpsi2ee.py +# configuration file for 'Standard Loose Jpsi2ee' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose Jpsi2ee' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.6 $" +# ============================================================================= +__all__ = ( + 'StdLooseJpsi2ee' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseJpsi2ee = CombineParticles ( 'StdLooseJpsi2ee' ) +StdLooseJpsi2ee.InputLocations = [ "StdLooseElectrons" ] +StdLooseJpsi2ee.DecayDescriptor = "J/psi(1S) -> e+ e-" + +StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseJpsi2ee.MotherCut = "(VFASPF(VCHI2)<25)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseJpsi2ee ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py new file mode 100755 index 000000000..b5ab6d97c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseKaons.py +# configuration file for 'Standard Loose Kaons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Kaons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker('StdLooseKaons', Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(k-pi)>'-5.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py new file mode 100755 index 000000000..597e7fc47 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseKs.py,v 1.5 2009-05-26 13:48:13 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseKs.py +# configuration file for 'Standard Loose ' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose Ks' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseKsLL' , + 'StdLooseKsDD' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseKsLL = CombineParticles ( 'StdLooseKsLL' ) + +StdLooseKsLL.InputLocations = [ "StdLoosePions" ] +StdLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" + +StdLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)" } +StdLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKsLL.MotherCut = "(ADMASS('KS0') < 35.*MeV) & (VFASPF(VCHI2) < 25.)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseKsLL ) + +## ============================================================================ +# configuration file for 'Standard Loose Downstream ' +# @author Greig Cowan +# @date 2009-04-27 +# ============================================================================= +StdLooseKsDD = CombineParticles ( 'StdLooseKsDD' ) + +StdLooseKsDD.InputLocations = [ "StdNoPIDsDownPions" ] +StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" + +StdLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)" } +StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKsDD.MotherCut = "(ADMASS('KS0') < 64.*MeV) & (VFASPF(VCHI2) < 25.)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseKsDD ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py new file mode 100755 index 000000000..4c40754a3 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseKstar.py,v 1.4 2009-06-28 12:02:54 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseKstar.py +# configuration file for 'Standard Loose Kstar' +# (based on lifetime unbiased JpsiK* requirements) +# @author Greig Cowan +# @date 2009-06-23 +# ============================================================================= +""" +Configuration file for 'Standard Loose Kstar' +""" +__author__ = "Greig Cowan" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseKstar2Kpi' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseKstar2Kpi = CombineParticles ("StdLooseKstar2Kpi") +StdLooseKstar2Kpi.InputLocations = ["StdLooseKaons", "StdLoosePions"] +StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" +StdLooseKstar2Kpi.CombinationCut = "(ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.) & (PT > 500.*MeV)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseKstar2Kpi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py new file mode 100755 index 000000000..9424bbdb7 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseLambda.py,v 1.2 2010-08-24 17:48:00 yamhis Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseLambda.py +# configuration file for 'Standard Loose ' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose Lambda' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLooseLambdaLL' , + 'StdLooseLambdaDD' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseLambdaLL = CombineParticles ( 'StdLooseLambdaLL' ) + +StdLooseLambdaLL.InputLocations = [ "StdLoosePions", "StdLooseProtons" ] +StdLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc" + +StdLooseLambdaLL.DaughtersCuts = { + "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)", + "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)" + } + +StdLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(40, ''))" +StdLooseLambdaLL.MotherCut = "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseLambdaLL ) + +## ============================================================================ +# configuration file for 'Standard Loose Downstream ' +# @author Greig Cowan +# @date 2009-04-27 +# ============================================================================= +StdLooseLambdaDD = StdLooseLambdaLL.clone( 'StdLooseLambdaDD' ) + +StdLooseLambdaDD.InputLocations = [ "StdNoPIDsDownPions", "StdNoPIDsDownProtons" ] + +StdLooseLambdaDD.DaughtersCuts = { + "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)", + "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)" + } + +StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseLambdaDD.MotherCut = "(ADMASS('Lambda0')<64*MeV) & (VFASPF(VCHI2)<25)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseLambdaDD ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py new file mode 100755 index 000000000..58e80f715 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py @@ -0,0 +1,46 @@ +""" +Configuration file for 'Standard Loose Lambda_c+' +""" +__author__ = "Liming Zhang" +__date__ = '09/12/2009' +__version__ = "version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdLooseLambdac2PKPi' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseLambdac2PKPi = CombineParticles ( 'StdLooseLambdac2PKPi' ) + +StdLooseLambdac2PKPi.InputLocations = [ "StdLooseKaons", "StdLoosePions", "StdLooseProtons" ] + +StdLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" +StdLooseLambdac2PKPi.DaughtersCuts = { + "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", + "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", + "p+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" + } + +StdLooseLambdac2PKPi.CombinationCut = "(ADAMASS('Lambda_c+')<150*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50, ''))" +StdLooseLambdac2PKPi.MotherCut = "(VFASPF(VCHI2) < 30 )" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseLambdac2PKPi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py new file mode 100755 index 000000000..1d8992dfe --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseMergedPi0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseMergedPi0.py +# configuration file for 'Standard Loose Pions' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose MergedPi0' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLooseMergedPi0' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import MergedPi0Maker + +from GaudiKernel.SystemOfUnits import MeV + +from CommonParticles.Utils import * + + +## create the algorithm +algorithm = MergedPi0Maker ( 'StdLooseMergedPi0' , + DecayDescriptor = 'Pi0' , + MassWindow = 60.* MeV) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseMergedPi0 = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py new file mode 100755 index 000000000..2bd3dd8bf --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseMuons.py +# configuration file for 'Standard Loose Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +# ============================================================================= +__all__ = ( + 'StdLooseMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseMuons', + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py new file mode 100755 index 000000000..fd8961d1d --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py @@ -0,0 +1,42 @@ +##!/usr/bin/env python +# ============================================================================= +# $Id: StdLoosePhi.py,v 1.6 2009-06-29 09:16:49 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdLoosePhi2KK.py +# configuration file for 'Standard Loose ' +# @author Greig Cowan +# @date 2009-06-23 +# ============================================================================= +""" +Configuration file for 'Standard Loose Phi2KK' +""" +__author__ = "Greig Cowan" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.6 $" +# ============================================================================= +__all__ = ( + 'StdLoosePhi2KK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLoosePhi2KK = CombineParticles("StdLoosePhi2KK") +StdLoosePhi2KK.InputLocations = ["StdLooseKaons"] +StdLoosePhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" +StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLoosePhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLoosePhi2KK ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py new file mode 100755 index 000000000..b0dd09b77 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLoosePhotons.py,v 1.2 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLoosePhotons.py +# configuration file for 'Standard Loose Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Photons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLoosePhotons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import PhotonMakerAlg +from Configurables import PhotonMaker + +from GaudiKernel.SystemOfUnits import MeV + +from CommonParticles.Utils import * + + +## create the algorithm +algorithm = PhotonMakerAlg ( 'StdLoosePhotons' , + DecayDescriptor = 'Gamma' ) + +algorithm.addTool ( PhotonMaker , name = 'PhotonMaker' ) +photon = algorithm.PhotonMaker +photon.ConvertedPhotons = False +photon.UnconvertedPhotons = True +photon.PtCut = 200 * MeV + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLoosePhotons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py new file mode 100755 index 000000000..23b726680 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLoosePions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLoosePions.py +# configuration file for 'Standard Loose Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLoosePions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLoosePions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +fltr.Selection = [ "" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLoosePions = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py new file mode 100755 index 000000000..974790a78 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseProtons.py +# configuration file for 'Standard Loose Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Protons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseProtons', + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(p-pi)>'-5.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseProtons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py new file mode 100755 index 000000000..22b965cbf --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseResolvedEta.py,v 1.1 2010-01-06 11:04:12 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseResolvedEta.py +# configuration file for 'Standard Loose Pions' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose ResolvedEta' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdLooseResolvedEta' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ResolvedPi0Maker, PhotonMaker + +from GaudiKernel.SystemOfUnits import MeV + +from CommonParticles.Utils import * + + +## create the algorithm +algorithm = ResolvedPi0Maker ( 'StdLooseResolvedEta' , + DecayDescriptor = 'Eta', + MassWindow = 50.* MeV, + Particle = 'eta') +algorithm.addTool(PhotonMaker) +algorithm.PhotonMaker.PtCut = 200.*MeV + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseResolvedEta = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py new file mode 100755 index 000000000..b2efa4b83 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseResolvedPi0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseResolvedPi0.py +# configuration file for 'Standard Loose Pions' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose ResolvedPi0' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLooseResolvedPi0' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ResolvedPi0Maker, PhotonMaker + +from GaudiKernel.SystemOfUnits import MeV + +from CommonParticles.Utils import * + + +## create the algorithm +algorithm = ResolvedPi0Maker ( 'StdLooseResolvedPi0' , + DecayDescriptor = 'Pi0', + MassWindow = 30.* MeV ) +algorithm.addTool(PhotonMaker) +algorithm.PhotonMaker.PtCut = 200.*MeV + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseResolvedPi0 = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py new file mode 100755 index 000000000..812d1a379 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseRho0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseRho0.py +# configuration file for 'Standard Loose Rho0' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose ' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLooseRho0' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) + +StdLooseRho0.InputLocations = [ "StdLoosePions" ] +StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" +StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV) & (ADOCACHI2CUT(20, ''))" +StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseRho0 ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py new file mode 100755 index 000000000..6cdc925db --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseRhoPlus.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseRhoPlus.py +# configuration file for 'Standard Loose RhoPlus' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose RhoPlus' +""" +__author__ = "Yasmine Amhis" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLooseRhoPlus' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseRhoPlus = CombineParticles ( 'StdLooseRhoPlus' ) + +StdLooseRhoPlus = CombineParticles("StdLooseRhoPlus") +StdLooseRhoPlus.InputLocations = [ "StdLooseMergedPi0", + "StdLooseResolvedPi0", + "StdLoosePions", + "StdLooseKaons"] +StdLooseRhoPlus.DecayDescriptor = "[rho(770)- -> pi- pi0]cc" +StdLooseRhoPlus.DaughtersCuts = {"pi+" : "ALL", "K+" : "ALL", + "pi0" : "(PT>1000*MeV) & (P> 1500*MeV)"} +#Note +#The cut of 550 MeV around the K*(892)+ is NOT a typo, is motivated +#by the requirements of the B2DVec HLT2 selection +StdLooseRhoPlus.CombinationCut = "(ADAMASS('K*(892)+')<550*MeV)" +StdLooseRhoPlus.MotherCut = "ALL" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseRhoPlus ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py new file mode 100644 index 000000000..b430e087e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdMassConstrainedJpsi2MuMu.py,v 1.2 2010-09-05 20:36:44 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdMassConstrainedJpsi2MuMu.py +# configuration file for 'Standard mass constrained Jpsi2MuMu' +# @author Roel Aaij +# @date 2010-08-31 +# ============================================================================= +""" +Configuration file for 'Standard mass constrained Jpsi2MuMu' +""" +__author__ = "Roel Aaij" +__version__ = "" +# ============================================================================= +__all__ = ( + 'StdMassConstrainedJpsi2MuMu' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * + +## ============================================================================ +StdMassConstrainedJpsi2MuMu = FilterDesktop("StdMassConstrainedJpsi2MuMu") +StdMassConstrainedJpsi2MuMu.InputLocations =["StdLooseJpsi2MuMu"] +StdMassConstrainedJpsi2MuMu.Code = " (ADMASS('J/psi(1S)') < 80.*MeV)" \ + "& (VFASPF(VCHI2) < 16.)" \ + "& (MFIT)" + #"& (INFO( LHCb.Particle.Chi2OfMassConstrainedFit, 100 ) < 25)" + #"& (MINTREE('mu+'==ABSID, PIDmu) > -10.0)" \ + +## configure Data-On-Demand service +locations = updateDoD ( StdMassConstrainedJpsi2MuMu ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py new file mode 100755 index 000000000..4496ba108 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Electrons with downstram tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm , trackTypes = [ "Downstream" ]) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsDownElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py new file mode 100644 index 000000000..7f9fc08c5 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownPions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsDownPions.py +# configuration file for 'Standard NoPIDs Downstream Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Downstream Pions' +""" +__author__ = "Alessio Sarti <Alessio.Sarti@lnf.infn.it>" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsDownPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownPions' , + DecayDescriptor = 'Pion' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = ['Downstream'], cuts = { "Chi2Cut" : [0,10] } ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsDownPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py new file mode 100644 index 000000000..2d0d7cc9a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsDownProtons.py +# configuration file for 'Standard NoPIDs Downstream Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Downstream Protons' +""" +__author__ = "Alessio Sarti <Alessio.Sarti@lnf.infn.it>" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsDownProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownProtons' , + DecayDescriptor = 'Proton' , + Particle = 'proton') + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = ['Downstream'], cuts = { "Chi2Cut" : [0,10] } ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsDownProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py new file mode 100755 index 000000000..13b9332b8 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsElectrons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Electrons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py new file mode 100755 index 000000000..b64a51a45 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsKaons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsKaons.py +# configuration file for 'Standard NoPIDs Kaons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Kaons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsKaons' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py new file mode 100755 index 000000000..4f98f7db3 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsMuons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsMuons.py +# configuration file for 'Standard NoPIDs Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsMuons' , + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsMuons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py new file mode 100755 index 000000000..d6445f3b8 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsPions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py new file mode 100755 index 000000000..f4ca55c23 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsProtons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsProtons.py +# configuration file for 'Standard NoPIDs Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Protons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsProtons' , + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py new file mode 100755 index 000000000..b3a53979e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsUpElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Electrons with Upstream tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsUpElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = [ "Upstream" ] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsUpElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py new file mode 100644 index 000000000..402236305 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsUpPions.py,v 1.1 2009-10-08 12:37:06 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsUpPions.py +# configuration file for 'Standard NoPIDs Upstream Pions' +# @author Patrick Koppenburg patrick.koppenburg@cern.ch +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Upstream Pions' +""" +__author__ = "Patrick Koppenburg patrick.koppenburg@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsUpPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsUpPions' , + DecayDescriptor = 'Pion' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = ['Upstream'] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsUpPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsVeloElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsVeloElectrons.py new file mode 100755 index 000000000..5d7e708ef --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsVeloElectrons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsVeloElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Electrons with VELO tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsVeloElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm,trackTypes = [ "Velo" ] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsVeloElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py new file mode 100755 index 000000000..61ff31f67 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightElectrons.py,v 1.5 2010-06-01 09:41:12 odescham Exp $ +# ============================================================================= +## @file CommonParticles/StdTightElectrons.py +# configuration file for 'Standard Loose Electrons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Tight Electrons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from Configurables import BremAdder + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightElectrons', + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +fltr.Selection = [ "RequiresDet='CALO' CombDLL(e-pi)>'0.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightElectrons = algorithm + +## temporary: +#algorithm.addTool ( BremAdder ) +#brem = algorithm.BremAdder +#brem.BremCor = 1.0 + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py new file mode 100755 index 000000000..9a7282f9a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdTightKaons.py +# configuration file for 'Standard Tight Kaons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Tight Kaons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdTightKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightKaons', + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(k-pi)>'0.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightKaons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py new file mode 100755 index 000000000..8992fd180 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdTightMuons.py +# configuration file for 'Standard Tight Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Tight Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +# ============================================================================= +__all__ = ( + 'StdTightMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightMuons' , + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuon=True CombDLL(mu-pi)>'-3.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightPions.py new file mode 100755 index 000000000..1f6587a08 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightPions.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightPions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdTightPions.py +# configuration file for 'Standard Tight Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Tight Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdTightPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightPions', + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(pi-k)>'-5.0'" ] + + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightPions = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py new file mode 100755 index 000000000..9186d97df --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdTightProtons.py +# configuration file for 'Standard Tight Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Tight Protons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdTightProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightProtons', Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(p-pi)>'0.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightProtons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py new file mode 100755 index 000000000..dae40c4bd --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py @@ -0,0 +1,77 @@ +""" +Configuration file for 'Standard Very Loose D0 -> HH' +""" +__author__ = "Liming Zhang" +__date__ = '09/12/2009' +__version__ = "version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseD02KPi' , + 'StdVeryLooseD02PiPi' , + 'StdVeryLooseD02KK' , + 'StdVeryLooseD02KPiDCS' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseD02KPi = CombineParticles ( 'StdVeryLooseD02KPi' ) + +StdVeryLooseD02KPi.InputLocations = [ "StdLooseKaons", "StdNoPIDsPions" ] +StdVeryLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" + +StdVeryLooseD02KPi.DaughtersCuts = { + "K+" : "(PT>250*MeV) & (P>2*GeV) & (MIPDV(PRIMARY)>0.05*mm)", + "pi+" : "(PT>250*MeV) & (P>2*GeV) & (MIPDV(PRIMARY)>0.05*mm)" + } + +#for the mass window, need 100 MeV above the Ds mass for clean background estimation, but only need +#~150 MeV below since the lower mass sideband will be for the crystal ball only. +StdVeryLooseD02KPi.CombinationCut = " (ADAMASS('D0')<60*MeV) & (APT>1*GeV) & (ADOCACHI2CUT(20,''))" +StdVeryLooseD02KPi.MotherCut = "(VFASPF(VCHI2)<10) & (M > 1710*MeV)" + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseD02KPi ) + +## ============================================================================ +## PiPi +StdVeryLooseD02PiPi = StdVeryLooseD02KPi.clone("StdVeryLooseD02PiPi") +StdVeryLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" +StdVeryLooseD02PiPi.InputLocations = [ "StdNoPIDsPions" ] + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseD02PiPi ) + +## ============================================================================ +## KK +StdVeryLooseD02KK = StdVeryLooseD02KPi.clone("StdVeryLooseD02KK") +StdVeryLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" +StdVeryLooseD02KK.InputLocations = [ "StdNoPIDsKaons" ] + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseD02KK ) + +## ============================================================================ +## Doubly Cabibbo suppressed +StdVeryLooseD02KPiDCS = StdVeryLooseD02KPi.clone("StdVeryLooseD02KPiDCS") +StdVeryLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" +StdVeryLooseD02KPiDCS.InputLocations = [ "StdLooseKaons", "StdNoPIDsPions" ] + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseD02KPiDCS ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py new file mode 100644 index 000000000..6cf466322 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py @@ -0,0 +1,31 @@ +""" +Configuration file for Standard Very Loose Kstar2Kpi +""" + +__author__ = 'P. Koppenburg' +__date__ = '22/01/2010' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles # , OfflineVertexFitter, OnOfflineTool +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdVeryLooseDetachetKst2Kpi # +########################### + +StdVeryLooseDetachedKst2Kpi = CombineParticles("StdVeryLooseDetachedKst2Kpi") +StdVeryLooseDetachedKst2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" +StdVeryLooseDetachedKst2Kpi.InputLocations = ["StdLooseKaons","StdLoosePions"] +StdVeryLooseDetachedKst2Kpi.DaughtersCuts = { + "K+" :"(ISLONG) & (MIPCHI2DV(PRIMARY)>2.25)", + "pi-":"(ISLONG) & (MIPCHI2DV(PRIMARY)>2.25)" + } + +StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV) & (ADOCACHI2CUT(30,''))" +StdVeryLooseDetachedKst2Kpi.MotherCut = "(VFASPF(VCHI2)<25)" + +locations = updateDoD(StdVeryLooseDetachedKst2Kpi) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py new file mode 100644 index 000000000..6a81a8618 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py @@ -0,0 +1,33 @@ +""" +Configuration file for Standard Loose DiMuon, very loose for penguins +""" + +__author__ = 'Rob Lambert' +__date__ = '07/07/2009' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdLooseDiMuon # +########################### + +StdVeryLooseDiMuon = CombineParticles("StdVeryLooseDiMuon") +StdVeryLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdVeryLooseDiMuon.InputLocations = ["StdVeryLooseMuons"] +StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV) & (ADOCACHI2CUT(30.,''))" +StdVeryLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25.)" +locations = updateDoD(StdVeryLooseDiMuon) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py new file mode 100755 index 000000000..eaeca696a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py @@ -0,0 +1,72 @@ +""" +Configuration file for 'Standard VeryLoose Dplus' +""" +__author__ = "Liming Zhang" +__date__ = '09/12/2009' +__version__ = "version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseDplus2KPiPi' , + 'StdVeryLooseDplus2KKPi' , + 'StdVeryLooseDplus2PiPiPi' , + 'StdVeryLooseDplus2KPiPiOppSignPi' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseDplus2KPiPi = CombineParticles ( 'StdVeryLooseDplus2KPiPi' ) + +StdVeryLooseDplus2KPiPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdVeryLooseDplus2KPiPi.DecayDescriptor = "[D+ -> K- pi+ pi+]cc" +StdVeryLooseDplus2KPiPi.DaughtersCuts = { + "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", + "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))" + } + +#Need an upper mass window of 150 MeV for background estimation +#and a lower mass window of 250 to catch the D+ and Ds +StdVeryLooseDplus2KPiPi.CombinationCut = "(ADAMASS('D_s+')<250*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50.,''))" +StdVeryLooseDplus2KPiPi.MotherCut = "(VFASPF(VCHI2) < 30 ) & (M < 2120.*MeV) " + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDplus2KPiPi ) + +########################################################################################## +# D+ -> K K Pi is a clone of D+ -> K Pi Pi +# +StdVeryLooseDplus2KKPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2KKPi") +StdVeryLooseDplus2KKPi.DecayDescriptor = "[D+ -> K- K+ pi+]cc" +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDplus2KKPi ) +########################################################################################## +# D+ -> 3 pi is a clone of D+ -> K Pi Pi +# +StdVeryLooseDplus2PiPiPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2PiPiPi") +StdVeryLooseDplus2PiPiPi.InputLocations = [ "StdNoPIDsPions" ] +StdVeryLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDplus2PiPiPi ) +########################################################################################## +# Also need the opposite sign pions mode for the Ds +# +StdVeryLooseDplus2KPiPiOppSignPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2KPiPiOppSignPi") +StdVeryLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDplus2KPiPiOppSignPi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py new file mode 100644 index 000000000..d5f54df1b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdVeryLooseDstarWithD2HH.py,v 1.5 2010-09-05 20:36:44 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdVeryLooseDstarWithD02HH.py +# configuration file for 'Standard VeryLoose Dstar WithD02HH' +# similar to StdLooseDstarWithD2HH.py but using Very Loose D0 +# and also StdNoPIDsUpPions to make the D* slow pion. Add two cuts on slow pion. +# ============================================================================= +""" +Configuration file for 'Standard VeryLoose Dstar WithD02HH' +""" +__author__ = "Marta Calvi" +__date__ = '10/12/2009' +__version__ = "version $Revision: 1.5 $" + +# ============================================================================= +__all__ = ( + 'StdVeryLooseDstarWithD02KPi' , + 'StdVeryLooseDstarWithD02KPiDCS' , + 'StdVeryLooseDstarWithD02PiPi' , + 'StdVeryLooseDstarWithD02KK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseDstarWithD02KPi = CombineParticles ( 'StdVeryLooseDstarWithD02KPi' ) + +StdVeryLooseDstarWithD02KPi.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02KPi" ] +StdVeryLooseDstarWithD02KPi.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" + +StdVeryLooseDstarWithD02KPi.CombinationCut = "(ADAMASS('D*(2010)+')<80*MeV) & (APT>1250*MeV)" +StdVeryLooseDstarWithD02KPi.MotherCut = "(VFASPF(VCHI2/VDOF)<25) & (M-MAXTREE('D0'==ABSID,M)<165.5)" +StdVeryLooseDstarWithD02KPi.DaughtersCuts = {"pi+" : "(PT>110*MeV) & (MIPDV(PRIMARY)>0.04*mm)"} + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDstarWithD02KPi ) + +################################################################################ +# D* with Cabibbo-suppressed D0->K+Pi- is a clone of D* with D0->KPi +# +StdVeryLooseDstarWithD02KPiDCS = StdVeryLooseDstarWithD02KPi.clone("StdVeryLooseDstarWithD02KPiDCS") +GaudiSequencer("SeqStdVeryLooseDstarWithD02KPiDCS").Members += [ StdVeryLooseDstarWithD02KPiDCS ] +StdVeryLooseDstarWithD02KPiDCS.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" +StdVeryLooseDstarWithD02KPiDCS.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02KPiDCS" ] +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDstarWithD02KPiDCS ) + +################################################################################ +# D* with D0->KK is a clone of D* with D0->Kpi +# +StdVeryLooseDstarWithD02KK = StdVeryLooseDstarWithD02KPi.clone("StdVeryLooseDstarWithD02KK") +GaudiSequencer("SeqStdVeryLooseDstarWithD02KK").Members += [ StdVeryLooseDstarWithD02KK ] +StdVeryLooseDstarWithD02KK.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" +StdVeryLooseDstarWithD02KK.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02KK" ] +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDstarWithD02KK ) + +################################################################################ +# D* with D0->PiPi is a clone of D* with D0->KK +# +StdVeryLooseDstarWithD02PiPi = StdVeryLooseDstarWithD02KK.clone("StdVeryLooseDstarWithD02PiPi") +GaudiSequencer("SeqStdVeryLooseDstarWithD02PiPi").Members += [ StdVeryLooseDstarWithD02PiPi ] +StdVeryLooseDstarWithD02PiPi.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" +StdVeryLooseDstarWithD02PiPi.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02PiPi" ] +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseDstarWithD02PiPi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py new file mode 100644 index 000000000..f23c36322 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdVeryLooseJpsi2MuMu.py,v 1.1 2010-01-18 10:08:49 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdVeryLooseJpsi2MuMu.py +# configuration file for 'Standard Very Loose Jpsi2MuMu' +# @author Greig Cowan +# @date 2009-06-23 +# ============================================================================= +""" +Configuration file for 'Standard Very Loose Jpsi2MuMu' +""" +__author__ = "Greig Cowan" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseJpsi2MuMu' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseJpsi2MuMu = CombineParticles ("StdVeryLooseJpsi2MuMu") +StdVeryLooseJpsi2MuMu.InputLocations = ["StdVeryLooseMuons"] +StdVeryLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30.,''))" +StdVeryLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseJpsi2MuMu ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py new file mode 100755 index 000000000..35fd51bc9 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py @@ -0,0 +1,45 @@ +""" +Configuration file for 'Standard VeryLoose Lambda_c+' +""" +__author__ = "Liming Zhang" +__date__ = '09/12/2009' +__version__ = "version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseLambdac2PKPi' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseLambdac2PKPi = CombineParticles ( 'StdVeryLooseLambdac2PKPi' ) + +StdVeryLooseLambdac2PKPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions", "StdNoPIDsProtons" ] +StdVeryLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" +StdVeryLooseLambdac2PKPi.DaughtersCuts = { + "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", + "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", + "p+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))" + } + +StdVeryLooseLambdac2PKPi.CombinationCut = "(ADAMASS('Lambda_c+')<150*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50.,''))" +StdVeryLooseLambdac2PKPi.MotherCut = "(VFASPF(VCHI2) < 30 )" + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseLambdac2PKPi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py new file mode 100755 index 000000000..f54d55992 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdVeryLooseMuons.py,v 1.1 2009-10-08 12:37:06 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdVeryLooseMuons.py +# configuration file for 'Standard Very Loose Muons' +# @author Patrick Koppenburg patrick.koppenburg@cern.ch +# @date 2009-10-08 +# ============================================================================= +""" +Configuration file for 'Standard Very Loose Muons' +""" +__author__ = "Patrick Koppenburg patrick.koppenburg@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdVeryLooseMuons', + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuonLoose=True" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdVeryLooseMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/Utils.py b/Phys/CommonParticles/python/CommonParticles/Utils.py new file mode 100755 index 000000000..b7272ae7c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/Utils.py @@ -0,0 +1,126 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: Utils.py,v 1.5 2009-07-21 08:59:46 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/Utils.py +# helper file for configuration of "standard particles" +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Helper file for configuration of 'standard particles' +""" +author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + # general: + 'updateDoD' , ## update data-on-demand service + 'locationsDoD' , ## print locations, known for data-on-demand service + 'particles' , ## locations, known for data-on-demand service + 'trackSelector' , ## get the track selector + 'protoFilter' , ## filter for (charged) protoparticles + ) +# ============================================================================= + +from Gaudi.Configuration import * +from Configurables import DataOnDemandSvc +from Configurables import TrackSelector +from Configurables import LHCbConfigurableUser + +# local storage of data-on-demand actions +_particles = {} + +# ============================================================================= +## @class DefaultTrackingCuts +# Little class to hold default track selection criteria +class DefaultTrackingCuts(LHCbConfigurableUser) : + ## Configuration slots + __slots__ = { "Cuts" : { "Chi2Cut" : [ 0, 5 ] }, ## The cuts to apply + "Types" : ["Long"] ## The track types to include + } + +# ============================================================================= +## Return the locations known for data-on-demand service +def particles () : + """ + Return the locations known for data-oon-demand service + """ + return _particles + + +# ============================================================================= +# Update Data-On-Demand Service +def updateDoD ( alg , hat = 'Phys/' ) : + """ + Update Data-On-Demand service + """ + _parts = { hat+alg.name() : alg } + _particles.update ( _parts ) + + dod = DataOnDemandSvc() + dod.AlgMap.update( + { hat + alg.name() + '/Particles' : alg.getFullName() , + hat + alg.name() + '/Vertices' : alg.getFullName() } + ) + return _parts + +## get the track selector +def trackSelector ( alg , + tracks = TrackSelector, + trackTypes = [], + cuts = {} + ) : + """ + Get the track selector for maker + """ + alg.addTool ( tracks ) + + selector = getattr ( alg , tracks.getType() ) + + # selection cuts + # Ugly but works ... + if 0 == len(trackTypes) : + trackTypes = DefaultTrackingCuts().Types + if 0 == len(cuts) : + cuts = DefaultTrackingCuts().Cuts + selector.TrackTypes = trackTypes + for name,cut in cuts.iteritems() : + selector.setProp("Min"+name,cut[0]) + selector.setProp("Max"+name,cut[1]) + + return selector + +## get the protoparticle filter +def protoFilter ( alg , fltr , name ) : + """ + Get the protoparticle filter + """ + alg.addTool ( fltr , name ) + return getattr ( alg , name ) + + +# ============================================================================= +## nice prinout for the input locations, known for Data-On-Demand Service +def locationsDoD ( particles = _particles ) : + """ + Nice printout of the known algorithm for 'standard particles' + """ + line = ' +' + 100*'-' + '+ ' + result = line + result += '\n | %-45.45s : %-50.50s |' % ( 'Input Location for DVAlgorithm' , + 'Data-On-Demand creator' ) + result += '\n' + line + locs = particles.keys() + locs.sort() + for l in locs : + a = particles[l] + if a.name() == a.getType() : a = a.name() + else : a = a.getFullName() + result += '\n | %-45.45s : %-50.50s |' % ( l , a ) + result += '\n' + line + return result + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/__init__.py b/Phys/CommonParticles/python/CommonParticles/__init__.py new file mode 100755 index 000000000..c46f6d634 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/__init__.py @@ -0,0 +1,7 @@ +# $Id: __init__.py,v 1.1 2009-01-15 14:22:15 ibelyaev Exp $ +# ============================================================================= + + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_load_modules.qmt b/Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_load_modules.qmt new file mode 100644 index 000000000..42b826dfb --- /dev/null +++ b/Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_load_modules.qmt @@ -0,0 +1,7 @@ +<?xml version="1.0" ?> +<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'> +<extension class="GaudiTest.GaudiExeTest" kind="test"> + <argument name="program"> + <text>$COMMONPARTICLESROOT/tests/test_load_modules.py</text> + </argument> +</extension> diff --git a/Phys/CommonParticles/tests/test_load_modules.py b/Phys/CommonParticles/tests/test_load_modules.py new file mode 100755 index 000000000..dc12a8430 --- /dev/null +++ b/Phys/CommonParticles/tests/test_load_modules.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +#$Id: test_load_modules.py,v 1.1 2010-04-22 14:44:53 jpalac Exp $ +''' +Test loading various CommonParticles in the Analysis environment. Needs to be extended. +''' +__author__ = 'Juan Palacios juan.palacios@nikhef.nl' + + +import sys +sys.path.append('../python') + + +def test_load_utils() : + from CommonParticles import Utils + +def test_load_standard_basic_neutral() : + from CommonParticles import StandardBasicNeutral + +def test_load_standard_basic_charged() : + from CommonParticles import StandardBasicCharged + +def test_load_all() : + from CommonParticles import * + +if '__main__' == __name__ : + + import sys + + test_names = filter(lambda k : k.count('test_') > 0, locals().keys()) + + __tests = filter( lambda x : x[0] in test_names, locals().items()) + + + message = '' + summary = '\n' + length = len(sorted(test_names, + cmp = lambda x,y : cmp(len(y),len(x)))[0]) +2 + + for test in __tests : + try : + test[1]() + message = 'PASS' + except : + message = "FAIL" + summary += test[0].ljust(length) + ':' + message.rjust(10) + '\n' + + if summary.count('FAIL') > 0 : + message = 'FAIL' + wr = sys.stderr.write + else : + message = 'PASS' + wr = sys.stdout.write + + summary += 'Global'.ljust(length) + ':' + message.rjust(10) + '\n\n' + wr(summary) + -- GitLab From df17ab6858091d9082fbf842affebd47f64595db Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:01:12 +0100 Subject: [PATCH 02/50] v1r1 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 12 ++++++++++++ .../python/CommonParticles/StdLooseDplus.py | 18 +++++++++++------- .../StdMassConstrainedJpsi2MuMu.py | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 77d0e9195..fb920d8d7 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v7r5 +version v7r6 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 805e9dc99..37af7fb0e 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v7r5 +v7r6 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 433d0cace..9e907d062 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,18 @@ ! !----------------------------------------------------------------------------- +!========================== CommonParticles v7r6 2010-11-09 =================== + +! 2010-11-08 - Greig Cowan + - Opened Jpsi mass window. + +! 2010-11-05 - Rudolf Oldeman + - python/CommonParticles/StdLooseDplus.py + + Added permutations to CombinationCut of StdLooseDplus2hhh + +! 2010-10-05 - Wouter Hulsbergen + - tightened mass window for StdMassConstrainedJpsi2MuMu + !========================== CommonParticles v7r5 2010-10-04 =================== ! 2010-10-01 - Jibo He diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py index 6f4e73c51..64452fb6a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py @@ -76,18 +76,22 @@ StdLooseDplus2hhh.DaughtersCuts = { "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" } -StdLooseDplus2hhh.CombinationCut = """( +StdLooseDplus2hhh.CombinationCut = """(APT>1.*GeV) & (ADOCACHI2CUT(50, '')) & ( in_range(1769*MeV, mpipipi , 2069 * MeV) | in_range(1769*MeV, mKpipi , 2069 * MeV) | - in_range(1769*MeV, mKKpi , 2069 * MeV) | - in_range(1769*MeV, mKpipiDCS , 2069 * MeV) - ) & (APT>1.*GeV) & (ADOCACHI2CUT(50, '')) + in_range(1769*MeV, mKKpi1 , 2069 * MeV) | + in_range(1769*MeV, mKKpi2 , 2069 * MeV) | + in_range(1769*MeV, mKpipiDCS1 , 2069 * MeV) | + in_range(1769*MeV, mKpipiDCS2 , 2069 * MeV) + ) """ StdLooseDplus2hhh.MotherCut = "(VFASPF(VCHI2) < 30 )" -StdLooseDplus2hhh.Preambulo = [ "mpipipi = AWM ('pi-' , 'pi+' , 'pi+' ) " , +StdLooseDplus2hhh.Preambulo = [ "mpipipi = AWM ('pi-' , 'pi+', 'pi+' ) " , "mKpipi = AWM ('K-' , 'pi+', 'pi+' ) " , - "mKKpi = AWM ('K-' , 'K+' , 'pi+' ) " , - "mKpipiDCS = AWM ( 'pi-' , 'K+' , 'pi+' )" ] + "mKKpi1 = AWM ('K-' , 'K+' , 'pi+' ) " , + "mKKpi2 = AWM ('K-' , 'pi+', 'K+' ) " , + "mKpipiDCS1 = AWM ( 'pi-' , 'K+' , 'pi+' )", + "mKpipiDCS2 = AWM ( 'pi-' , 'pi+', 'K+' )" ] ## configure Data-On-Demand service locations = updateDoD (StdLooseDplus2hhh) diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index b430e087e..30d8c3d2c 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -27,9 +27,9 @@ StdMassConstrainedJpsi2MuMu = FilterDesktop("StdMassConstrainedJpsi2MuMu") StdMassConstrainedJpsi2MuMu.InputLocations =["StdLooseJpsi2MuMu"] StdMassConstrainedJpsi2MuMu.Code = " (ADMASS('J/psi(1S)') < 80.*MeV)" \ "& (VFASPF(VCHI2) < 16.)" \ + "& (MINTREE('mu+'==ABSID, PIDmu) > 0)" \ "& (MFIT)" #"& (INFO( LHCb.Particle.Chi2OfMassConstrainedFit, 100 ) < 25)" - #"& (MINTREE('mu+'==ABSID, PIDmu) > -10.0)" \ ## configure Data-On-Demand service locations = updateDoD ( StdMassConstrainedJpsi2MuMu ) -- GitLab From 49303534fe0aabc5fa3b3f5648288795b5380841 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:01:24 +0100 Subject: [PATCH 03/50] v1r2 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 7 +++++++ Phys/CommonParticles/tests/test_load_modules.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index fb920d8d7..1ca5c5bfd 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v7r6 +version v7r6p1 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 37af7fb0e..e9e11a8d1 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v7r6 +v7r6p1 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 9e907d062..dfe56af62 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,13 @@ ! !----------------------------------------------------------------------------- +!========================== CommonParticles v7r6p1 2010-12-20 ================ + +! 2010-11-29 - Juan Palacios + - tests/test_load_modules.py + . Remove false failure. + - Increase to v7r6p1. + !========================== CommonParticles v7r6 2010-11-09 =================== ! 2010-11-08 - Greig Cowan diff --git a/Phys/CommonParticles/tests/test_load_modules.py b/Phys/CommonParticles/tests/test_load_modules.py index dc12a8430..a1fbd0d48 100755 --- a/Phys/CommonParticles/tests/test_load_modules.py +++ b/Phys/CommonParticles/tests/test_load_modules.py @@ -20,7 +20,7 @@ def test_load_standard_basic_charged() : from CommonParticles import StandardBasicCharged def test_load_all() : - from CommonParticles import * + import CommonParticles if '__main__' == __name__ : -- GitLab From f0a4886d486232c464a86ddaed66ac40012d4e7b Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:01:36 +0100 Subject: [PATCH 04/50] v2r0 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 22 ++++++++++++ .../CommonParticles/StdLTUnbiasedJpsi2MuMu.py | 2 +- .../python/CommonParticles/StdLooseD02HH.py | 16 +++++---- .../python/CommonParticles/StdLooseD02KsHH.py | 7 ++-- .../CommonParticles/StdLooseDetachedKstar.py | 2 +- .../CommonParticles/StdLooseDetachedPhi.py | 2 +- .../CommonParticles/StdLooseDiElectron.py | 2 +- .../python/CommonParticles/StdLooseDiMuon.py | 2 +- .../CommonParticles/StdLooseDiMuonSameSign.py | 2 +- .../python/CommonParticles/StdLooseDplus.py | 7 ++-- .../CommonParticles/StdLooseDstarWithD2HH.py | 18 ++++++---- .../CommonParticles/StdLooseJpsi2MuMu.py | 2 +- .../python/CommonParticles/StdLooseJpsi2ee.py | 2 +- .../python/CommonParticles/StdLooseKs.py | 6 ++-- .../python/CommonParticles/StdLooseKstar.py | 3 +- .../python/CommonParticles/StdLooseLambda.py | 6 ++-- .../python/CommonParticles/StdLooseLambdac.py | 4 ++- .../python/CommonParticles/StdLoosePhi.py | 2 +- .../python/CommonParticles/StdLooseRho0.py | 2 +- .../python/CommonParticles/StdLooseRhoPlus.py | 8 ++--- .../StdMassConstrainedJpsi2MuMu.py | 2 +- .../CommonParticles/StdVeryLooseD02HH.py | 17 ++++++---- .../StdVeryLooseDetachedKstar.py | 3 +- .../CommonParticles/StdVeryLooseDiMuon.py | 2 +- .../CommonParticles/StdVeryLooseDplus.py | 5 +-- .../StdVeryLooseDstarWithD2HH.py | 12 ++++--- .../CommonParticles/StdVeryLooseJpsi2MuMu.py | 2 +- .../CommonParticles/StdVeryLooseLambdac.py | 4 ++- .../python/CommonParticles/Utils.py | 5 ++- .../test_inputlocations_consistency.qmt | 7 ++++ .../tests/test_inputlocations_consistency.py | 34 +++++++++++++++++++ 33 files changed, 151 insertions(+), 63 deletions(-) create mode 100644 Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_inputlocations_consistency.qmt create mode 100755 Phys/CommonParticles/tests/test_inputlocations_consistency.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 1ca5c5bfd..0210d8cd9 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v7r6p1 +version v8r0 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index e9e11a8d1..7b4e68a5b 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v7r6p1 +v8r0 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index dfe56af62..9e2972c84 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,28 @@ ! !----------------------------------------------------------------------------- +!========================== CommonParticles v8r0 2011-02-22 ================== + +! 2011-02-22 - Juan Palacios + - InputLocations -> Inputs + + + +! 2011-02-21 - Juan Palacios + - StdLooseKs, StdVeryLooseD02HH, StdLooseDstarWithD2HH, StdLooseD02HH + . Bug fix: locations map was being over-written, keeping info for last + common particles only. + - All CommonParticles + . Set complete InputLocations paths: "Phys/<alg name>/Particles" + - Add QM test testing that all InputLocations are among CommonParticles + output locations. + +! 2011-02-17 - Juan Palacios + - Data-On-Demand locations now include "/Particles" ending. + - Remove <hay>/<alg name>/Vertices from Data-On-Demand. Nobody should + ask for vertices directly, these come via the Particles. + - Increase to v8r0. + !========================== CommonParticles v7r6p1 2010-12-20 ================ ! 2010-11-29 - Juan Palacios diff --git a/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py index 601773e82..8272ccbab 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLTUnbiasedJpsi2MuMu.py @@ -24,7 +24,7 @@ from CommonParticles.Utils import * ## ============================================================================ StdLTUnbiasedJpsi2MuMu = FilterDesktop("StdLTUnbiasedJpsi2MuMu") -StdLTUnbiasedJpsi2MuMu.InputLocations =["StdLooseJpsi2MuMu"] +StdLTUnbiasedJpsi2MuMu.Inputs =["Phys/StdLooseJpsi2MuMu/Particles"] StdLTUnbiasedJpsi2MuMu.Code = " (MINTREE('mu+'==ABSID, PT) > 500.*MeV)" \ "& (MINTREE('mu+'==ABSID, PIDmu) > -10.0)" \ "& (MAXTREE('mu+'==ABSID, PIDK) < 10.0)" \ diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py index 636e32edc..6b4ad940c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py @@ -29,7 +29,8 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseD02KPi = CombineParticles ( 'StdLooseD02KPi' ) -StdLooseD02KPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdLooseD02KPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", + "Phys/StdNoPIDsPions/Particles" ] StdLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" StdLooseD02KPi.DaughtersCuts = { "K+" : "(PT>250*MeV) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)", @@ -48,28 +49,29 @@ locations = updateDoD ( StdLooseD02KPi ) ## PiPi StdLooseD02PiPi = StdLooseD02KPi.clone("StdLooseD02PiPi") StdLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" -StdLooseD02PiPi.InputLocations = [ "StdNoPIDsPions" ] +StdLooseD02PiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdLooseD02PiPi ) +locations.update( updateDoD ( StdLooseD02PiPi ) ) ## ============================================================================ ## KK StdLooseD02KK = StdLooseD02KPi.clone("StdLooseD02KK") StdLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" -StdLooseD02KK.InputLocations = [ "StdNoPIDsKaons" ] +StdLooseD02KK.Inputs = [ "Phys/StdNoPIDsKaons/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdLooseD02KK ) +locations.update( updateDoD ( StdLooseD02KK ) ) ## ============================================================================ ## Doubly Cabibbo suppressed StdLooseD02KPiDCS = StdLooseD02KPi.clone("StdLooseD02KPiDCS") StdLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" -StdLooseD02KPiDCS.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdLooseD02KPiDCS.Inputs = [ "Phys/StdNoPIDsKaons/Particles", + "Phys/StdNoPIDsPions/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdLooseD02KPiDCS ) +locations.update( updateDoD ( StdLooseD02KPiDCS ) ) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py index 88d4f6ac7..1c2fb339c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py @@ -30,7 +30,9 @@ from CommonParticles.Utils import * # StdLooseD02KsPiPi = CombineParticles("StdLooseD02KsPiPi") -StdLooseD02KsPiPi.InputLocations = [ "StdLoosePions", "StdLooseKsLL" ] +StdLooseD02KsPiPi.Inputs = [ "Phys/StdLoosePions/Particles", + "Phys/StdLooseKsLL/Particles" ] + StdLooseD02KsPiPi.DecayDescriptor = "[D0 -> KS0 pi+ pi-]cc" StdLooseD02KsPiPi.DaughtersCuts = { "pi+" : "(PT>400*MeV)", @@ -47,7 +49,8 @@ locations = updateDoD ( StdLooseD02KsPiPi ) # StdLooseD02KsKK = StdLooseD02KsPiPi.clone("StdLooseD02KsKK") -StdLooseD02KsKK.InputLocations = [ "StdLooseKaons", "StdLooseKsLL" ] +StdLooseD02KsKK.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdLooseKsLL/Particles" ] StdLooseD02KsKK.DecayDescriptor = "[D0 -> KS0 K+ K-]cc" StdLooseD02KsKK.DaughtersCuts = { "K+" : "(PT>300*MeV)", diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py index 6b0412606..3ce2c6b60 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKstar.py @@ -16,7 +16,7 @@ import GaudiKernel.SystemOfUnits as Units ########################### StdLooseDetachedKst2Kpi = FilterDesktop("StdLooseDetachedKst2Kpi") -StdLooseDetachedKst2Kpi.InputLocations = ["StdVeryLooseDetachedKst2Kpi"] +StdLooseDetachedKst2Kpi.Inputs = ["Phys/StdVeryLooseDetachedKst2Kpi/Particles"] StdLooseDetachedKst2Kpi.Code = "(MIPCHI2DV(PRIMARY)> 2.25)" locations = updateDoD(StdLooseDetachedKst2Kpi) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py index 0edd8eeb4..580e27036 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py @@ -25,7 +25,7 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseDetachedPhi2KK = CombineParticles ("StdLooseDetachedPhi2KK") -StdLooseDetachedPhi2KK.InputLocations = ["StdLooseKaons"] +StdLooseDetachedPhi2KK.Inputs = ["Phys/StdLooseKaons/Particles"] StdLooseDetachedPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" StdLooseDetachedPhi2KK.DaughtersCuts = {"K+": "(MIPCHI2DV(PRIMARY) > 4.)"} StdLooseDetachedPhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30, ''))" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index 0d23a754d..b951912fb 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -17,7 +17,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiElectron = CombineParticles("StdLooseDiElectron") StdLooseDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" -StdLooseDiElectron.InputLocations = ["StdLooseElectrons"] +StdLooseDiElectron.Inputs = ["Phys/StdLooseElectrons/Particles"] StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30, ''))" StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDiElectron) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py index 6c847ec9e..647941d7b 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py @@ -17,7 +17,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiMuon = CombineParticles("StdLooseDiMuon") StdLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdLooseDiMuon.InputLocations = ["StdLooseMuons"] +StdLooseDiMuon.Inputs = ["Phys/StdLooseMuons/Particles"] StdLooseDiMuon.CombinationCut = "(ADOCACHI2CUT(30, ''))" StdLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25)" locations = updateDoD(StdLooseDiMuon) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py index d32d56cca..c22879509 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py @@ -13,7 +13,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiMuonSameSign = CombineParticles("StdLooseDiMuonSameSign") StdLooseDiMuonSameSign.DecayDescriptor = "[J/psi(1S) -> mu+ mu+]cc" -StdLooseDiMuonSameSign.InputLocations = ["StdLooseMuons"] +StdLooseDiMuonSameSign.Inputs = ["Phys/StdLooseMuons/Particles"] StdLooseDiMuonSameSign.CombinationCut = "(ADOCACHI2CUT(30, ''))" StdLooseDiMuonSameSign.MotherCut = "(VFASPF(VCHI2) < 25)" locations = updateDoD(StdLooseDiMuonSameSign) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py index 64452fb6a..360473ecb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py @@ -30,7 +30,8 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseDplus2KPiPi = CombineParticles ( 'StdLooseDplus2KPiPi' ) -StdLooseDplus2KPiPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdLooseDplus2KPiPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", + "Phys/StdNoPIDsPions/Particles" ] StdLooseDplus2KPiPi.DecayDescriptor = "[D+ -> K- pi+ pi+]cc" StdLooseDplus2KPiPi.DaughtersCuts = { "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", @@ -57,7 +58,7 @@ locations = updateDoD ( StdLooseDplus2KKPi ) # D+ -> 3 pi is a clone of D+ -> K Pi Pi # StdLooseDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2PiPiPi") -StdLooseDplus2PiPiPi.InputLocations = [ "StdNoPIDsPions" ] +StdLooseDplus2PiPiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] StdLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDplus2PiPiPi ) @@ -70,7 +71,7 @@ StdLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" locations = updateDoD ( StdLooseDplus2KPiPiOppSignPi ) StdLooseDplus2hhh = CombineParticles ( 'StdLooseDplus2hhh') -StdLooseDplus2hhh.InputLocations = [ "StdNoPIDsPions" ] +StdLooseDplus2hhh.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] StdLooseDplus2hhh.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" StdLooseDplus2hhh.DaughtersCuts = { "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py index 34611990a..38a6d855c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py @@ -29,7 +29,8 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseDstarWithD02KPi = CombineParticles ( 'StdLooseDstarWithD02KPi' ) -StdLooseDstarWithD02KPi.InputLocations = [ "StdLoosePions", "StdLooseD02KPi" ] +StdLooseDstarWithD02KPi.Inputs = [ "Phys/StdLoosePions/Particles", + "Phys/StdLooseD02KPi/Particles" ] StdLooseDstarWithD02KPi.DecayDescriptor = "[D*(2010)+ -> pi+ D0]cc" StdLooseDstarWithD02KPi.CombinationCut = "(ADAMASS('D*(2010)+')<50*MeV) & (APT>1250*MeV)" @@ -43,27 +44,30 @@ locations = updateDoD ( StdLooseDstarWithD02KPi ) # StdLooseDstarWithD02KPiDCS = StdLooseDstarWithD02KPi.clone("StdLooseDstarWithD02KPiDCS") GaudiSequencer("SeqStdLooseDstarWithD02KPiDCS").Members += [ StdLooseDstarWithD02KPiDCS ] -StdLooseDstarWithD02KPiDCS.InputLocations = [ "StdLoosePions", "StdLooseD02KPiDCS" ] +StdLooseDstarWithD02KPiDCS.Inputs = [ "Phys/StdLoosePions/Particles", + "Phys/StdLooseD02KPiDCS/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdLooseDstarWithD02KPiDCS ) +locations.update( updateDoD ( StdLooseDstarWithD02KPiDCS ) ) ################################################################################ # D* with D0->KK is a clone of D* with D0->Kpi # StdLooseDstarWithD02KK = StdLooseDstarWithD02KPi.clone("StdLooseDstarWithD02KK") StdLooseDstarWithD02KK.DecayDescriptor = "[D*(2010)+ -> pi+ D0]cc" -StdLooseDstarWithD02KK.InputLocations = [ "StdLoosePions", "StdLooseD02KK" ] +StdLooseDstarWithD02KK.Inputs = [ "Phys/StdLoosePions/Particles", + "Phys/StdLooseD02KK/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdLooseDstarWithD02KK ) +locations.update( updateDoD ( StdLooseDstarWithD02KK ) ) ################################################################################ # D* with D0->PiPi is a clone of D* with D0->KK # StdLooseDstarWithD02PiPi = StdLooseDstarWithD02KK.clone("StdLooseDstarWithD02PiPi") GaudiSequencer("SeqStdLooseDstarWithD02PiPi").Members += [ StdLooseDstarWithD02PiPi ] -StdLooseDstarWithD02PiPi.InputLocations = [ "StdLoosePions", "StdLooseD02PiPi" ] +StdLooseDstarWithD02PiPi.Inputs = [ "Phys/StdLoosePions/Particles", + "Phys/StdLooseD02PiPi/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdLooseDstarWithD02PiPi ) +locations.update( updateDoD ( StdLooseDstarWithD02PiPi ) ) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py index c007ff5ac..29b199215 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py @@ -25,7 +25,7 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseJpsi2MuMu = CombineParticles ("StdLooseJpsi2MuMu") -StdLooseJpsi2MuMu.InputLocations = ["StdLooseMuons"] +StdLooseJpsi2MuMu.Inputs = ["Phys/StdLooseMuons/Particles"] StdLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30., ''))" StdLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py index a75bc9fe1..14708201a 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py @@ -25,7 +25,7 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseJpsi2ee = CombineParticles ( 'StdLooseJpsi2ee' ) -StdLooseJpsi2ee.InputLocations = [ "StdLooseElectrons" ] +StdLooseJpsi2ee.Inputs = [ "Phys/StdLooseElectrons/Particles" ] StdLooseJpsi2ee.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV) & (ADOCACHI2CUT(30, ''))" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py index 597e7fc47..24e8c6b4a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py @@ -27,7 +27,7 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseKsLL = CombineParticles ( 'StdLooseKsLL' ) -StdLooseKsLL.InputLocations = [ "StdLoosePions" ] +StdLooseKsLL.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" StdLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)" } @@ -44,7 +44,7 @@ locations = updateDoD ( StdLooseKsLL ) # ============================================================================= StdLooseKsDD = CombineParticles ( 'StdLooseKsDD' ) -StdLooseKsDD.InputLocations = [ "StdNoPIDsDownPions" ] +StdLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ] StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" StdLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)" } @@ -52,7 +52,7 @@ StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV) & (ADOCACHI2CUT(30., ' StdLooseKsDD.MotherCut = "(ADMASS('KS0') < 64.*MeV) & (VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseKsDD ) +locations.update( updateDoD ( StdLooseKsDD )) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py index 4c40754a3..b2e96a2f8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py @@ -26,7 +26,8 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseKstar2Kpi = CombineParticles ("StdLooseKstar2Kpi") -StdLooseKstar2Kpi.InputLocations = ["StdLooseKaons", "StdLoosePions"] +StdLooseKstar2Kpi.Inputs = ["Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles"] StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" StdLooseKstar2Kpi.CombinationCut = "(ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30., ''))" StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.) & (PT > 500.*MeV)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py index 9424bbdb7..db36e5494 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py @@ -27,7 +27,8 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseLambdaLL = CombineParticles ( 'StdLooseLambdaLL' ) -StdLooseLambdaLL.InputLocations = [ "StdLoosePions", "StdLooseProtons" ] +StdLooseLambdaLL.Inputs = [ "Phys/StdLoosePions/Particles", + "Phys/StdLooseProtons/Particles" ] StdLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc" StdLooseLambdaLL.DaughtersCuts = { @@ -48,7 +49,8 @@ locations = updateDoD ( StdLooseLambdaLL ) # ============================================================================= StdLooseLambdaDD = StdLooseLambdaLL.clone( 'StdLooseLambdaDD' ) -StdLooseLambdaDD.InputLocations = [ "StdNoPIDsDownPions", "StdNoPIDsDownProtons" ] +StdLooseLambdaDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles", + "Phys/StdNoPIDsDownProtons/Particles" ] StdLooseLambdaDD.DaughtersCuts = { "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)", diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py index 58e80f715..cdd37781e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py @@ -18,7 +18,9 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseLambdac2PKPi = CombineParticles ( 'StdLooseLambdac2PKPi' ) -StdLooseLambdac2PKPi.InputLocations = [ "StdLooseKaons", "StdLoosePions", "StdLooseProtons" ] +StdLooseLambdac2PKPi.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles", + "Phys/StdLooseProtons/Particles" ] StdLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" StdLooseLambdac2PKPi.DaughtersCuts = { diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py index fd8961d1d..a93d704c8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py @@ -25,7 +25,7 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLoosePhi2KK = CombineParticles("StdLoosePhi2KK") -StdLoosePhi2KK.InputLocations = ["StdLooseKaons"] +StdLoosePhi2KK.Inputs = ["Phys/StdLooseKaons/Particles"] StdLoosePhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30., ''))" StdLoosePhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py index 812d1a379..d443952b3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -26,7 +26,7 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) -StdLooseRho0.InputLocations = [ "StdLoosePions" ] +StdLooseRho0.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV) & (ADOCACHI2CUT(20, ''))" StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py index 6cdc925db..d902d5ea6 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRhoPlus.py @@ -27,10 +27,10 @@ from CommonParticles.Utils import * StdLooseRhoPlus = CombineParticles ( 'StdLooseRhoPlus' ) StdLooseRhoPlus = CombineParticles("StdLooseRhoPlus") -StdLooseRhoPlus.InputLocations = [ "StdLooseMergedPi0", - "StdLooseResolvedPi0", - "StdLoosePions", - "StdLooseKaons"] +StdLooseRhoPlus.Inputs = [ "Phys/StdLooseMergedPi0/Particles", + "Phys/StdLooseResolvedPi0/Particles", + "Phys/StdLoosePions/Particles", + "Phys/StdLooseKaons/Particles"] StdLooseRhoPlus.DecayDescriptor = "[rho(770)- -> pi- pi0]cc" StdLooseRhoPlus.DaughtersCuts = {"pi+" : "ALL", "K+" : "ALL", "pi0" : "(PT>1000*MeV) & (P> 1500*MeV)"} diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 30d8c3d2c..b5732db39 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -24,7 +24,7 @@ from CommonParticles.Utils import * ## ============================================================================ StdMassConstrainedJpsi2MuMu = FilterDesktop("StdMassConstrainedJpsi2MuMu") -StdMassConstrainedJpsi2MuMu.InputLocations =["StdLooseJpsi2MuMu"] +StdMassConstrainedJpsi2MuMu.Inputs =["Phys/StdLooseJpsi2MuMu/Particles"] StdMassConstrainedJpsi2MuMu.Code = " (ADMASS('J/psi(1S)') < 80.*MeV)" \ "& (VFASPF(VCHI2) < 16.)" \ "& (MINTREE('mu+'==ABSID, PIDmu) > 0)" \ diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py index dae40c4bd..eb197429e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py @@ -21,7 +21,9 @@ from CommonParticles.Utils import * ## create the algorithm StdVeryLooseD02KPi = CombineParticles ( 'StdVeryLooseD02KPi' ) -StdVeryLooseD02KPi.InputLocations = [ "StdLooseKaons", "StdNoPIDsPions" ] +StdVeryLooseD02KPi.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdNoPIDsPions/Particles" ] + StdVeryLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" StdVeryLooseD02KPi.DaughtersCuts = { @@ -41,28 +43,29 @@ locations = updateDoD ( StdVeryLooseD02KPi ) ## PiPi StdVeryLooseD02PiPi = StdVeryLooseD02KPi.clone("StdVeryLooseD02PiPi") StdVeryLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" -StdVeryLooseD02PiPi.InputLocations = [ "StdNoPIDsPions" ] +StdVeryLooseD02PiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseD02PiPi ) +locations.update( updateDoD ( StdVeryLooseD02PiPi ) ) ## ============================================================================ ## KK StdVeryLooseD02KK = StdVeryLooseD02KPi.clone("StdVeryLooseD02KK") StdVeryLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" -StdVeryLooseD02KK.InputLocations = [ "StdNoPIDsKaons" ] +StdVeryLooseD02KK.Inputs = [ "Phys/StdNoPIDsKaons/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseD02KK ) +locations.update( updateDoD ( StdVeryLooseD02KK ) ) ## ============================================================================ ## Doubly Cabibbo suppressed StdVeryLooseD02KPiDCS = StdVeryLooseD02KPi.clone("StdVeryLooseD02KPiDCS") StdVeryLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" -StdVeryLooseD02KPiDCS.InputLocations = [ "StdLooseKaons", "StdNoPIDsPions" ] +StdVeryLooseD02KPiDCS.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdNoPIDsPions/Particles" ] ## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseD02KPiDCS ) +locations.update( updateDoD ( StdVeryLooseD02KPiDCS ) ) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py index 6cf466322..f2a33c912 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py @@ -17,7 +17,8 @@ import GaudiKernel.SystemOfUnits as Units StdVeryLooseDetachedKst2Kpi = CombineParticles("StdVeryLooseDetachedKst2Kpi") StdVeryLooseDetachedKst2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" -StdVeryLooseDetachedKst2Kpi.InputLocations = ["StdLooseKaons","StdLoosePions"] +StdVeryLooseDetachedKst2Kpi.Inputs = ["Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles"] StdVeryLooseDetachedKst2Kpi.DaughtersCuts = { "K+" :"(ISLONG) & (MIPCHI2DV(PRIMARY)>2.25)", "pi-":"(ISLONG) & (MIPCHI2DV(PRIMARY)>2.25)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py index 6a81a8618..4126905e3 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py @@ -17,7 +17,7 @@ import GaudiKernel.SystemOfUnits as Units StdVeryLooseDiMuon = CombineParticles("StdVeryLooseDiMuon") StdVeryLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdVeryLooseDiMuon.InputLocations = ["StdVeryLooseMuons"] +StdVeryLooseDiMuon.Inputs = ["Phys/StdVeryLooseMuons/Particles"] StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV) & (ADOCACHI2CUT(30.,''))" StdVeryLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25.)" locations = updateDoD(StdVeryLooseDiMuon) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py index eaeca696a..bd6e882a7 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py @@ -21,7 +21,8 @@ from CommonParticles.Utils import * ## create the algorithm StdVeryLooseDplus2KPiPi = CombineParticles ( 'StdVeryLooseDplus2KPiPi' ) -StdVeryLooseDplus2KPiPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions" ] +StdVeryLooseDplus2KPiPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", + "Phys/StdNoPIDsPions/Particles" ] StdVeryLooseDplus2KPiPi.DecayDescriptor = "[D+ -> K- pi+ pi+]cc" StdVeryLooseDplus2KPiPi.DaughtersCuts = { "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", @@ -47,7 +48,7 @@ locations = updateDoD ( StdVeryLooseDplus2KKPi ) # D+ -> 3 pi is a clone of D+ -> K Pi Pi # StdVeryLooseDplus2PiPiPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2PiPiPi") -StdVeryLooseDplus2PiPiPi.InputLocations = [ "StdNoPIDsPions" ] +StdVeryLooseDplus2PiPiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] StdVeryLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" ## configure Data-On-Demand service locations = updateDoD ( StdVeryLooseDplus2PiPiPi ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py index d5f54df1b..10add670c 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py @@ -31,7 +31,8 @@ from CommonParticles.Utils import * ## create the algorithm StdVeryLooseDstarWithD02KPi = CombineParticles ( 'StdVeryLooseDstarWithD02KPi' ) -StdVeryLooseDstarWithD02KPi.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02KPi" ] +StdVeryLooseDstarWithD02KPi.Inputs = [ "Phys/StdNoPIDsPions/Particles", + "Phys/StdVeryLooseD02KPi/Particles" ] StdVeryLooseDstarWithD02KPi.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" StdVeryLooseDstarWithD02KPi.CombinationCut = "(ADAMASS('D*(2010)+')<80*MeV) & (APT>1250*MeV)" @@ -47,7 +48,8 @@ locations = updateDoD ( StdVeryLooseDstarWithD02KPi ) StdVeryLooseDstarWithD02KPiDCS = StdVeryLooseDstarWithD02KPi.clone("StdVeryLooseDstarWithD02KPiDCS") GaudiSequencer("SeqStdVeryLooseDstarWithD02KPiDCS").Members += [ StdVeryLooseDstarWithD02KPiDCS ] StdVeryLooseDstarWithD02KPiDCS.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" -StdVeryLooseDstarWithD02KPiDCS.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02KPiDCS" ] +StdVeryLooseDstarWithD02KPiDCS.Inputs = [ "Phys/StdNoPIDsPions/Particles", + "Phys/StdVeryLooseD02KPiDCS/Particles" ] ## configure Data-On-Demand service locations = updateDoD ( StdVeryLooseDstarWithD02KPiDCS ) @@ -57,7 +59,8 @@ locations = updateDoD ( StdVeryLooseDstarWithD02KPiDCS ) StdVeryLooseDstarWithD02KK = StdVeryLooseDstarWithD02KPi.clone("StdVeryLooseDstarWithD02KK") GaudiSequencer("SeqStdVeryLooseDstarWithD02KK").Members += [ StdVeryLooseDstarWithD02KK ] StdVeryLooseDstarWithD02KK.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" -StdVeryLooseDstarWithD02KK.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02KK" ] +StdVeryLooseDstarWithD02KK.Inputs = [ "Phys/StdNoPIDsPions/Particles", + "Phys/StdVeryLooseD02KK/Particles" ] ## configure Data-On-Demand service locations = updateDoD ( StdVeryLooseDstarWithD02KK ) @@ -67,7 +70,8 @@ locations = updateDoD ( StdVeryLooseDstarWithD02KK ) StdVeryLooseDstarWithD02PiPi = StdVeryLooseDstarWithD02KK.clone("StdVeryLooseDstarWithD02PiPi") GaudiSequencer("SeqStdVeryLooseDstarWithD02PiPi").Members += [ StdVeryLooseDstarWithD02PiPi ] StdVeryLooseDstarWithD02PiPi.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" -StdVeryLooseDstarWithD02PiPi.InputLocations = [ "StdNoPIDsPions", "StdVeryLooseD02PiPi" ] +StdVeryLooseDstarWithD02PiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles", + "Phys/StdVeryLooseD02PiPi/Particles" ] ## configure Data-On-Demand service locations = updateDoD ( StdVeryLooseDstarWithD02PiPi ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py index f23c36322..4ff5a7671 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py @@ -25,7 +25,7 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdVeryLooseJpsi2MuMu = CombineParticles ("StdVeryLooseJpsi2MuMu") -StdVeryLooseJpsi2MuMu.InputLocations = ["StdVeryLooseMuons"] +StdVeryLooseJpsi2MuMu.Inputs = ["Phys/StdVeryLooseMuons/Particles"] StdVeryLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30.,''))" StdVeryLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py index 35fd51bc9..6f860d635 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py @@ -18,7 +18,9 @@ from CommonParticles.Utils import * ## create the algorithm StdVeryLooseLambdac2PKPi = CombineParticles ( 'StdVeryLooseLambdac2PKPi' ) -StdVeryLooseLambdac2PKPi.InputLocations = [ "StdNoPIDsKaons", "StdNoPIDsPions", "StdNoPIDsProtons" ] +StdVeryLooseLambdac2PKPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", + "Phys/StdNoPIDsPions/Particles", + "Phys/StdNoPIDsProtons/Particles" ] StdVeryLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" StdVeryLooseLambdac2PKPi.DaughtersCuts = { "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", diff --git a/Phys/CommonParticles/python/CommonParticles/Utils.py b/Phys/CommonParticles/python/CommonParticles/Utils.py index b7272ae7c..6c5ce183c 100755 --- a/Phys/CommonParticles/python/CommonParticles/Utils.py +++ b/Phys/CommonParticles/python/CommonParticles/Utils.py @@ -55,13 +55,12 @@ def updateDoD ( alg , hat = 'Phys/' ) : """ Update Data-On-Demand service """ - _parts = { hat+alg.name() : alg } + _parts = { hat+alg.name()+'/Particles' : alg } _particles.update ( _parts ) dod = DataOnDemandSvc() dod.AlgMap.update( - { hat + alg.name() + '/Particles' : alg.getFullName() , - hat + alg.name() + '/Vertices' : alg.getFullName() } + { hat + alg.name() + '/Particles' : alg.getFullName() } ) return _parts diff --git a/Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_inputlocations_consistency.qmt b/Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_inputlocations_consistency.qmt new file mode 100644 index 000000000..6d88d4ad2 --- /dev/null +++ b/Phys/CommonParticles/tests/qmtest/commonparticles.qms/test_inputlocations_consistency.qmt @@ -0,0 +1,7 @@ +<?xml version="1.0" ?> +<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'> +<extension class="GaudiTest.GaudiExeTest" kind="test"> + <argument name="program"> + <text>$COMMONPARTICLESROOT/tests/test_inputlocations_consistency.py</text> + </argument> +</extension> diff --git a/Phys/CommonParticles/tests/test_inputlocations_consistency.py b/Phys/CommonParticles/tests/test_inputlocations_consistency.py new file mode 100755 index 000000000..89ae4eb57 --- /dev/null +++ b/Phys/CommonParticles/tests/test_inputlocations_consistency.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python +#$Id: test_load_modules.py,v 1.1 2010-04-22 14:44:53 jpalac Exp $ +''' +Test loading various CommonParticles in the Analysis environment. Needs to be extended. +''' +__author__ = 'Juan Palacios juan.palacios@nikhef.nl' + + +import sys +sys.path.append('../python') + +from CommonParticles import StandardBasic, StandardIntermediate, StdLooseKs + +outputLocations = list(StandardBasic.locations.keys()) + list(StandardIntermediate.locations.keys()) + +algs = list(StandardBasic.locations.values()) + list(StandardIntermediate.locations.values()) + +errors = {} + +message = "" + +for alg in algs : + locs = alg.Inputs + for loc in locs : + if not loc in outputLocations : + message+= "ERROR: Algorithm "+alg.name()+".Input "+loc+" not in output locations\n" + errors[alg.name()]=loc + + +if len(errors)>0 : + sys.stderr.write('test_inputlocations_consistency: FAIL\n') + sys.stderr.write(message) +else : + sys.stdout.write('test_inputlocations_consistency: PASS\n') -- GitLab From 37593a999279272fbd03e74807adc74047f7e6cd Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:01:44 +0100 Subject: [PATCH 05/50] v2r1 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 13 +++++++++++++ .../StdMassConstrainedJpsi2MuMu.py | 15 +++++++-------- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 0210d8cd9..24533718c 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r0 +version v8r1 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 7b4e68a5b..c8a6e1819 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r0 +v8r1 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 9e2972c84..0fc2e833e 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,19 @@ ! !----------------------------------------------------------------------------- +!========================== CommonParticles v8r1 2011-03-10 ================== + +! 2011-03-10 - Juan Palacios + - Looking at the QM tests, it seems the StdMassConstrainedJpsi2MuMu interference + had a large effect on the efficienct of StdLTUnbiasedJpsi2MuMu, which + uses StdLooseJpsi2MuMu. + - Increase to v8r1. + +! 2011-02-24 - Roel Aaij + - Changed StdMassConstrainedJpsi2MuMu from a FilterDesktop to a CombineParticles. + This will prevent the StdLooseJpsi2MuMu from also having the mass constraint + applied. + !========================== CommonParticles v8r0 2011-02-22 ================== ! 2011-02-22 - Juan Palacios diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index b5732db39..132faf3e8 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -19,17 +19,16 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import FilterDesktop +from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -StdMassConstrainedJpsi2MuMu = FilterDesktop("StdMassConstrainedJpsi2MuMu") -StdMassConstrainedJpsi2MuMu.Inputs =["Phys/StdLooseJpsi2MuMu/Particles"] -StdMassConstrainedJpsi2MuMu.Code = " (ADMASS('J/psi(1S)') < 80.*MeV)" \ - "& (VFASPF(VCHI2) < 16.)" \ - "& (MINTREE('mu+'==ABSID, PIDmu) > 0)" \ - "& (MFIT)" - #"& (INFO( LHCb.Particle.Chi2OfMassConstrainedFit, 100 ) < 25)" +StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") +StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdLooseMuons/Particles"] +StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : 'PIDmu > 0' } +StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & ADOCACHI2CUT(30., '')" +StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" ## configure Data-On-Demand service locations = updateDoD ( StdMassConstrainedJpsi2MuMu ) -- GitLab From 9ecaffd00784f83096c34c513394fb06fee39d5d Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:02:28 +0100 Subject: [PATCH 06/50] v2r4 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 4 ++++ Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 24533718c..ba41f4ff9 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r1 +version v8r2 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index c8a6e1819..cce11f650 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r1 +v8r2 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 0fc2e833e..d5da09538 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,10 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r2 2011-06-21 ========================= +! 2011-06-14 - Rolf Oldman + - move pT cut before vertex fit in Kstar + !========================== CommonParticles v8r1 2011-03-10 ================== ! 2011-03-10 - Juan Palacios diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py index b2e96a2f8..ac14fe635 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py @@ -29,8 +29,8 @@ StdLooseKstar2Kpi = CombineParticles ("StdLooseKstar2Kpi") StdLooseKstar2Kpi.Inputs = ["Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles"] StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" -StdLooseKstar2Kpi.CombinationCut = "(ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30., ''))" -StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.) & (PT > 500.*MeV)" +StdLooseKstar2Kpi.CombinationCut = "(APT > 500.*MeV) & (ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service locations = updateDoD ( StdLooseKstar2Kpi ) -- GitLab From 9f5028a6d55232b18fb6e997c7d17859e1adc6fa Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:02:38 +0100 Subject: [PATCH 07/50] v2r5 --- Phys/CommonParticles/cmt/requirements | 4 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 39 ++++++++ .../python/CommonParticles/StandardD0.py | 3 - .../python/CommonParticles/StandardDplus.py | 3 - .../python/CommonParticles/StandardDstar.py | 3 - .../CommonParticles/StandardElectrons.py | 6 ++ .../python/CommonParticles/StandardKaons.py | 6 ++ .../python/CommonParticles/StandardLambdac.py | 3 - .../python/CommonParticles/StandardMuons.py | 9 ++ .../python/CommonParticles/StandardPions.py | 6 ++ .../python/CommonParticles/StandardProtons.py | 6 ++ .../CommonParticles/StdAllLooseElectrons.py | 60 +++++++++++++ .../CommonParticles/StdAllLooseKaons.py | 52 +++++++++++ .../CommonParticles/StdAllLooseMuons.py | 56 ++++++++++++ .../CommonParticles/StdAllLoosePions.py | 56 ++++++++++++ .../CommonParticles/StdAllLooseProtons.py | 56 ++++++++++++ .../CommonParticles/StdAllNoPIDsElectrons.py | 49 +++++++++++ .../CommonParticles/StdAllNoPIDsKaons.py | 49 +++++++++++ .../CommonParticles/StdAllNoPIDsMuons.py | 49 +++++++++++ .../CommonParticles/StdAllNoPIDsPions.py | 49 +++++++++++ .../CommonParticles/StdAllNoPIDsProtons.py | 49 +++++++++++ .../CommonParticles/StdAllVeryLooseMuons.py | 56 ++++++++++++ .../python/CommonParticles/StdLooseD02HH.py | 16 ++-- .../CommonParticles/StdLooseDetachedPhi.py | 2 +- .../CommonParticles/StdLooseDiElectron.py | 4 +- .../python/CommonParticles/StdLooseDiMuon.py | 3 +- .../CommonParticles/StdLooseDiMuonSameSign.py | 3 +- .../python/CommonParticles/StdLooseDplus.py | 28 +++--- .../CommonParticles/StdLooseDstarWithD2HH.py | 10 +-- .../CommonParticles/StdLooseElectrons.py | 33 +++---- .../CommonParticles/StdLooseJpsi2MuMu.py | 6 +- .../python/CommonParticles/StdLooseJpsi2ee.py | 6 +- .../python/CommonParticles/StdLooseKaons.py | 25 +++--- .../python/CommonParticles/StdLooseKs.py | 4 +- .../python/CommonParticles/StdLooseKstar.py | 8 +- .../python/CommonParticles/StdLooseLambda.py | 4 +- .../python/CommonParticles/StdLooseLambdac.py | 10 +-- .../python/CommonParticles/StdLooseMuons.py | 27 +++--- .../python/CommonParticles/StdLoosePhi.py | 6 +- .../python/CommonParticles/StdLoosePions.py | 23 ++--- .../python/CommonParticles/StdLooseProtons.py | 23 ++--- .../python/CommonParticles/StdLooseRho0.py | 2 +- .../StdMassConstrainedJpsi2MuMu.py | 4 +- .../CommonParticles/StdNoPIDsElectrons.py | 24 ++--- .../python/CommonParticles/StdNoPIDsKaons.py | 26 +++--- .../python/CommonParticles/StdNoPIDsMuons.py | 26 +++--- .../python/CommonParticles/StdNoPIDsPions.py | 26 +++--- .../CommonParticles/StdNoPIDsProtons.py | 26 +++--- .../CommonParticles/StdVeryLooseD02HH.py | 80 ----------------- .../StdVeryLooseDetachedKstar.py | 6 +- .../CommonParticles/StdVeryLooseDiMuon.py | 4 +- .../CommonParticles/StdVeryLooseDplus.py | 73 --------------- .../StdVeryLooseDstarWithD2HH.py | 88 ------------------- .../CommonParticles/StdVeryLooseJpsi2MuMu.py | 2 +- .../CommonParticles/StdVeryLooseLambdac.py | 47 ---------- .../CommonParticles/StdVeryLooseMuons.py | 29 +++--- .../python/CommonParticles/Utils.py | 20 ++++- .../tests/test_inputlocations_consistency.py | 2 +- 59 files changed, 861 insertions(+), 536 deletions(-) create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py delete mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py delete mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py delete mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py delete mode 100755 Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index ba41f4ff9..a2a1dc56b 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r2 +version v8r3 #============================================================================ # Structure, i.e. directories to process. @@ -24,4 +24,4 @@ apply_pattern install_python_modules #============================================================================ use DaVinciKernel v* Phys #============================================================================ -apply_pattern QMTest \ No newline at end of file +apply_pattern QMTest diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index cce11f650..95f237c36 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r2 +v8r3 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index d5da09538..728fbbceb 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,45 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r3 2011-07-22 ========================= +! 2011-07-21 - Patrick Koppenburg + - Fix tests: + . StdAllVeryLooseMuons were not defined in StandardMuons + . Typo in StdLoosePhi2KK (dangerous!) + +! 2011-07-19 - Patrick Koppenburg + - Remove unused StdVeryLooseDplus, D0, Lambdac + +! 2011-07-18 - Patrick Koppenburg +* +* MAJOR CHANGE : PLEASE READ +* + - New Default Tracking cut removing clones + - New default PT>250MeV and IPCHI2>4 cut for all charged basic + - Added new StdAllLooseXxx and StdAllNoPIDsXxx (Xxx=Pions,Muons,Kaons,Protons,Electrons) + and StdAllVeryLooseMuons that do no implement PT>250MeV and IPCHI2>4 cut + - Changed StdLooseXxx, StdNoPIDsXxx and StdVeryLooseMuons to use the new particles + and implement the new default cuts + + WARNING : Now all StdLooseXxx and StdNoPIDsXxx have PT>250MeV and IPCHI2>4 + + - The following intermediate states have been changed to use the new StdAll + particles: + + StdLooseDiElectron + StdLooseDiMuon + StdLooseDiMuonSameSign + StdLooseDstarWithD2HH (only slow pion) + StdLooseElectrons + StdLooseJpsi2ee + StdLooseJpsi2MuMu + StdMassConstrainedJpsi2MuMu + StdVeryLooseDiMuon + + -> Hence they are still behaving like before + + - Remove all ADOCACHI2 cuts now useless because of LoKi::VertexFitter use. + !========================= CommonParticles v8r2 2011-06-21 ========================= ! 2011-06-14 - Rolf Oldman - move pT cut before vertex fit in Kstar diff --git a/Phys/CommonParticles/python/CommonParticles/StandardD0.py b/Phys/CommonParticles/python/CommonParticles/StandardD0.py index de3781767..93ebea0a1 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardD0.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardD0.py @@ -22,9 +22,6 @@ _locations.update ( locations ) from CommonParticles.StdLooseD02HH import * _locations.update ( locations ) -from CommonParticles.StdVeryLooseD02HH import * -_locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDplus.py b/Phys/CommonParticles/python/CommonParticles/StandardDplus.py index 91413b3e3..3dcec684f 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardDplus.py @@ -19,9 +19,6 @@ _locations = {} from CommonParticles.StdLooseDplus import * _locations.update ( locations ) -from CommonParticles.StdVeryLooseDplus import * -_locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDstar.py b/Phys/CommonParticles/python/CommonParticles/StandardDstar.py index ca18aea8e..daff01898 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardDstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardDstar.py @@ -19,9 +19,6 @@ _locations = {} from CommonParticles.StdLooseDstarWithD2HH import * _locations.update ( locations ) -from CommonParticles.StdVeryLooseDstarWithD2HH import * -_locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py index e685b7af8..dedbcaad9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py @@ -16,9 +16,15 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 _locations = {} +from CommonParticles.StdAllNoPIDsElectrons import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsElectrons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseElectrons import * +_locations.update ( locations ) + from CommonParticles.StdLooseElectrons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py index 07620a3ec..c49706e03 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py @@ -16,9 +16,15 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 _locations = {} +from CommonParticles.StdAllNoPIDsKaons import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsKaons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseKaons import * +_locations.update ( locations ) + from CommonParticles.StdLooseKaons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py b/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py index e53953183..7b7457533 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardLambdac.py @@ -19,9 +19,6 @@ _locations = {} from CommonParticles.StdLooseLambdac import * _locations.update ( locations ) -from CommonParticles.StdVeryLooseLambdac import * -_locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py index 6f025fa34..edf55da8b 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py @@ -16,12 +16,21 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 _locations = {} +from CommonParticles.StdAllNoPIDsMuons import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsMuons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseMuons import * +_locations.update ( locations ) + from CommonParticles.StdLooseMuons import * _locations.update ( locations ) +from CommonParticles.StdAllVeryLooseMuons import * +_locations.update ( locations ) + from CommonParticles.StdVeryLooseMuons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPions.py b/Phys/CommonParticles/python/CommonParticles/StandardPions.py index 1276e47b2..2fb9ae585 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardPions.py @@ -16,6 +16,9 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 _locations = {} +from CommonParticles.StdAllNoPIDsPions import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsPions import * _locations.update ( locations ) @@ -25,6 +28,9 @@ _locations.update ( locations ) from CommonParticles.StdNoPIDsUpPions import * _locations.update ( locations ) +from CommonParticles.StdAllLoosePions import * +_locations.update ( locations ) + from CommonParticles.StdLoosePions import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StandardProtons.py b/Phys/CommonParticles/python/CommonParticles/StandardProtons.py index 571b87392..9c63448fc 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardProtons.py @@ -16,12 +16,18 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 _locations = {} +from CommonParticles.StdAllNoPIDsProtons import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsProtons import * _locations.update ( locations ) from CommonParticles.StdNoPIDsDownProtons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseProtons import * +_locations.update ( locations ) + from CommonParticles.StdLooseProtons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py new file mode 100755 index 000000000..f1b9a621f --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseElectrons.py,v 1.5 2010-06-01 09:41:12 odescham Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseElectrons.py +# configuration file for 'Standard Loose Electrons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Electrons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from Configurables import BremAdder + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLooseElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +fltr.Selection = [ "RequiresDet='CALO' CombDLL(e-pi)>'-2.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseElectrons = algorithm + +## temporary: +#algorithm.addTool ( BremAdder ) +#brem = algorithm.BremAdder +#brem.BremCor = 1.0 + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py new file mode 100755 index 000000000..6685cd28d --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseKaons.py +# configuration file for 'Standard Loose Kaons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Kaons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker('StdAllLooseKaons', Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(k-pi)>'-5.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py new file mode 100755 index 000000000..87c97f4a3 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseMuons.py +# configuration file for 'Standard Loose Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLooseMuons', + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py b/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py new file mode 100755 index 000000000..460151907 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLoosePions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLoosePions.py +# configuration file for 'Standard Loose Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllLoosePions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLoosePions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +fltr.Selection = [ "" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLoosePions = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py new file mode 100755 index 000000000..8e2383e8f --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseProtons.py +# configuration file for 'Standard Loose Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Protons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLooseProtons', + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +fltr.Selection = [ "RequiresDet='RICH' CombDLL(p-pi)>'-5.0'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseProtons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py new file mode 100755 index 000000000..d77f3bbda --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsElectrons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Electrons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllNoPIDsElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py new file mode 100755 index 000000000..5de7913f1 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsKaons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsKaons.py +# configuration file for 'Standard NoPIDs Kaons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Kaons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllNoPIDsKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsKaons' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllNoPIDsKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py new file mode 100755 index 000000000..09bd416cf --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsMuons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsMuons.py +# configuration file for 'Standard NoPIDs Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllNoPIDsMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsMuons' , + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllNoPIDsMuons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py new file mode 100755 index 000000000..b4f17c057 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllNoPIDsPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsPions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllNoPIDsPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py new file mode 100755 index 000000000..92226d645 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsProtons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsProtons.py +# configuration file for 'Standard NoPIDs Protons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Protons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllNoPIDsProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsProtons' , + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllNoPIDsProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py new file mode 100755 index 000000000..7489aa21b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdVeryLooseMuons.py,v 1.1 2009-10-08 12:37:06 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdAllVeryLooseMuons.py +# configuration file for 'Standard AllVery Loose Muons' +# @author Patrick Koppenburg patrick.koppenburg@cern.ch +# @date 2009-10-08 +# ============================================================================= +""" +Configuration file for 'Standard AllVery Loose Muons' +""" +__author__ = "Patrick Koppenburg patrick.koppenburg@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdAllVeryLooseMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllVeryLooseMuons', + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuonLoose=True" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllVeryLooseMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py index 6b4ad940c..7a9d64c0e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py @@ -29,18 +29,18 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseD02KPi = CombineParticles ( 'StdLooseD02KPi' ) -StdLooseD02KPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", - "Phys/StdNoPIDsPions/Particles" ] +StdLooseD02KPi.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles" ] StdLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" -StdLooseD02KPi.DaughtersCuts = { "K+" : "(PT>250*MeV) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)", - "pi+" : "(PT>250*MeV) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"} +StdLooseD02KPi.DaughtersCuts = { "K+" : "(P>2*GeV)", + "pi+" : "(P>2*GeV)"} #for the mass window, need 100 MeV above the Ds mass for clean background estimation, but only need #~100 MeV below since the lower mass sideband will be for the crystal ball only. -StdLooseD02KPi.CombinationCut = "(APT>1*GeV) & (ADAMASS('D0')<200*MeV) & (ADOCACHI2CUT(20, ''))" -StdLooseD02KPi.MotherCut = "(VFASPF(VCHI2)<10) & (M > 1760*MeV)" +StdLooseD02KPi.CombinationCut = "(((APT>1*GeV) | (ASUM(PT)>1.2*GeV)) & (ADAMASS('D0')<110*MeV) & (ADOCA(1,2)<0.5*mm))" +StdLooseD02KPi.MotherCut = "((VFASPF(VCHI2)<10) & (ADMASS('D0')<100*MeV) & (BPVVDCHI2>36))" ## configure Data-On-Demand service locations = updateDoD ( StdLooseD02KPi ) @@ -49,7 +49,6 @@ locations = updateDoD ( StdLooseD02KPi ) ## PiPi StdLooseD02PiPi = StdLooseD02KPi.clone("StdLooseD02PiPi") StdLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" -StdLooseD02PiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseD02PiPi ) ) @@ -58,7 +57,6 @@ locations.update( updateDoD ( StdLooseD02PiPi ) ) ## KK StdLooseD02KK = StdLooseD02KPi.clone("StdLooseD02KK") StdLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" -StdLooseD02KK.Inputs = [ "Phys/StdNoPIDsKaons/Particles" ] ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseD02KK ) ) @@ -67,8 +65,6 @@ locations.update( updateDoD ( StdLooseD02KK ) ) ## Doubly Cabibbo suppressed StdLooseD02KPiDCS = StdLooseD02KPi.clone("StdLooseD02KPiDCS") StdLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" -StdLooseD02KPiDCS.Inputs = [ "Phys/StdNoPIDsKaons/Particles", - "Phys/StdNoPIDsPions/Particles" ] ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseD02KPiDCS ) ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py index 580e27036..87b37003d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py @@ -28,7 +28,7 @@ StdLooseDetachedPhi2KK = CombineParticles ("StdLooseDetachedPhi2KK") StdLooseDetachedPhi2KK.Inputs = ["Phys/StdLooseKaons/Particles"] StdLooseDetachedPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" StdLooseDetachedPhi2KK.DaughtersCuts = {"K+": "(MIPCHI2DV(PRIMARY) > 4.)"} -StdLooseDetachedPhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseDetachedPhi2KK.CombinationCut = "(AM < 1100.*MeV)" StdLooseDetachedPhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index b951912fb..a92cbe52e 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -17,8 +17,8 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiElectron = CombineParticles("StdLooseDiElectron") StdLooseDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" -StdLooseDiElectron.Inputs = ["Phys/StdLooseElectrons/Particles"] -StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] +StdLooseDiElectron.CombinationCut = "(AM>30*MeV)" StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDiElectron) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py index 647941d7b..1ac731fe9 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py @@ -17,8 +17,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiMuon = CombineParticles("StdLooseDiMuon") StdLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdLooseDiMuon.Inputs = ["Phys/StdLooseMuons/Particles"] -StdLooseDiMuon.CombinationCut = "(ADOCACHI2CUT(30, ''))" +StdLooseDiMuon.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25)" locations = updateDoD(StdLooseDiMuon) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py index c22879509..690b5ce66 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py @@ -13,8 +13,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiMuonSameSign = CombineParticles("StdLooseDiMuonSameSign") StdLooseDiMuonSameSign.DecayDescriptor = "[J/psi(1S) -> mu+ mu+]cc" -StdLooseDiMuonSameSign.Inputs = ["Phys/StdLooseMuons/Particles"] -StdLooseDiMuonSameSign.CombinationCut = "(ADOCACHI2CUT(30, ''))" +StdLooseDiMuonSameSign.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdLooseDiMuonSameSign.MotherCut = "(VFASPF(VCHI2) < 25)" locations = updateDoD(StdLooseDiMuonSameSign) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py index 360473ecb..34f388946 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py @@ -18,6 +18,7 @@ __all__ = ( 'StdLooseDplus2KKPi' , 'StdLooseDplus2PiPiPi' , 'StdLooseDplus2KPiPiOppSignPi' , + 'StdLooseDsplus2KKPi' , 'StdLooseDplus2hhh', 'locations' ) @@ -30,48 +31,51 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseDplus2KPiPi = CombineParticles ( 'StdLooseDplus2KPiPi' ) -StdLooseDplus2KPiPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", - "Phys/StdNoPIDsPions/Particles" ] +StdLooseDplus2KPiPi.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles" ] StdLooseDplus2KPiPi.DecayDescriptor = "[D+ -> K- pi+ pi+]cc" StdLooseDplus2KPiPi.DaughtersCuts = { - "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", - "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" + "K+" : "(P > 2*GeV)", + "pi+" : "(P > 2*GeV)" } #Need an upper mass window of 100 MeV for background estimation #and a lower mass window of 200 to catch the D+ and Ds -StdLooseDplus2KPiPi.CombinationCut = "(ADAMASS('D_s+')<200*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50, ''))" -StdLooseDplus2KPiPi.MotherCut = "(VFASPF(VCHI2) < 30 ) & (M < 2070.*MeV) " +StdLooseDplus2KPiPi.CombinationCut = "((AM>1760.*MeV) & (AM<2080.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))" +StdLooseDplus2KPiPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1770.*MeV) & (M < 2070.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDplus2KPiPi ) - ########################################################################################## # D+ -> K K Pi is a clone of D+ -> K Pi Pi # StdLooseDplus2KKPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KKPi") StdLooseDplus2KKPi.DecayDescriptor = "[D+ -> K- K+ pi+]cc" -## configure Data-On-Demand service locations = updateDoD ( StdLooseDplus2KKPi ) ########################################################################################## # D+ -> 3 pi is a clone of D+ -> K Pi Pi # StdLooseDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2PiPiPi") -StdLooseDplus2PiPiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] +StdLooseDplus2PiPiPi.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" -## configure Data-On-Demand service locations = updateDoD ( StdLooseDplus2PiPiPi ) ########################################################################################## +# D_s+ -> K K Pi is a clone of D+ -> K Pi Pi +# +StdLooseDsplus2KKPi = StdLooseDplus2KPiPi.clone("StdLooseDsplus2KKPi") +StdLooseDsplus2KKPi.DecayDescriptor = "[D_s+ -> K- K+ pi+]cc" +locations = updateDoD ( StdLooseDsplus2KKPi ) +########################################################################################## + # Also need the opposite sign pions mode for the Ds # StdLooseDplus2KPiPiOppSignPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KPiPiOppSignPi") StdLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" -## configure Data-On-Demand service locations = updateDoD ( StdLooseDplus2KPiPiOppSignPi ) StdLooseDplus2hhh = CombineParticles ( 'StdLooseDplus2hhh') -StdLooseDplus2hhh.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] +StdLooseDplus2hhh.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseDplus2hhh.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" StdLooseDplus2hhh.DaughtersCuts = { "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py index 38a6d855c..ef957bfc2 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDstarWithD2HH.py @@ -8,7 +8,7 @@ # @date 2009-02-18 # ============================================================================= """ -Configuration file for 'Standard Loose Dstar WithD02HH' +Configuration file for 'Standard Loose Dstar WithD02HH'. Lifetime unbiased at pion level """ __author__ = "Patrick Koppenburg" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" @@ -29,7 +29,7 @@ from CommonParticles.Utils import * ## create the algorithm StdLooseDstarWithD02KPi = CombineParticles ( 'StdLooseDstarWithD02KPi' ) -StdLooseDstarWithD02KPi.Inputs = [ "Phys/StdLoosePions/Particles", +StdLooseDstarWithD02KPi.Inputs = [ "Phys/StdAllLoosePions/Particles", "Phys/StdLooseD02KPi/Particles" ] StdLooseDstarWithD02KPi.DecayDescriptor = "[D*(2010)+ -> pi+ D0]cc" @@ -44,7 +44,7 @@ locations = updateDoD ( StdLooseDstarWithD02KPi ) # StdLooseDstarWithD02KPiDCS = StdLooseDstarWithD02KPi.clone("StdLooseDstarWithD02KPiDCS") GaudiSequencer("SeqStdLooseDstarWithD02KPiDCS").Members += [ StdLooseDstarWithD02KPiDCS ] -StdLooseDstarWithD02KPiDCS.Inputs = [ "Phys/StdLoosePions/Particles", +StdLooseDstarWithD02KPiDCS.Inputs = [ "Phys/StdAllLoosePions/Particles", "Phys/StdLooseD02KPiDCS/Particles" ] ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseDstarWithD02KPiDCS ) ) @@ -54,7 +54,7 @@ locations.update( updateDoD ( StdLooseDstarWithD02KPiDCS ) ) # StdLooseDstarWithD02KK = StdLooseDstarWithD02KPi.clone("StdLooseDstarWithD02KK") StdLooseDstarWithD02KK.DecayDescriptor = "[D*(2010)+ -> pi+ D0]cc" -StdLooseDstarWithD02KK.Inputs = [ "Phys/StdLoosePions/Particles", +StdLooseDstarWithD02KK.Inputs = [ "Phys/StdAllLoosePions/Particles", "Phys/StdLooseD02KK/Particles" ] ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseDstarWithD02KK ) ) @@ -64,7 +64,7 @@ locations.update( updateDoD ( StdLooseDstarWithD02KK ) ) # StdLooseDstarWithD02PiPi = StdLooseDstarWithD02KK.clone("StdLooseDstarWithD02PiPi") GaudiSequencer("SeqStdLooseDstarWithD02PiPi").Members += [ StdLooseDstarWithD02PiPi ] -StdLooseDstarWithD02PiPi.Inputs = [ "Phys/StdLoosePions/Particles", +StdLooseDstarWithD02PiPi.Inputs = [ "Phys/StdAllLoosePions/Particles", "Phys/StdLooseD02PiPi/Particles" ] ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseDstarWithD02PiPi ) ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py index 8681329b6..3db86b94a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py @@ -1,17 +1,17 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseElectrons.py,v 1.5 2010-06-01 09:41:12 odescham Exp $ +# $Id: StdLoosePions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdLooseElectrons.py # configuration file for 'Standard Loose Electrons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Electrons' +Configuration file for 'Standard Loose Electrons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdLooseElectrons' , @@ -19,22 +19,15 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombinedParticleMaker -from Configurables import ProtoParticleCALOFilter -from Configurables import BremAdder +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdLooseElectrons' , - Particle = 'electron' ) - -# configure the track selector -selector = trackSelector ( algorithm ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) -fltr.Selection = [ "RequiresDet='CALO' CombDLL(e-pi)>'-2.0'" ] +algorithm = FilterDesktop( 'StdLooseElectrons', + Inputs = ["Phys/StdAllLooseElectrons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -42,10 +35,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdLooseElectrons = algorithm -## temporary: -#algorithm.addTool ( BremAdder ) -#brem = algorithm.BremAdder -#brem.BremCor = 1.0 ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py index 29b199215..b9a4e9e87 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py @@ -8,7 +8,7 @@ # @date 2009-06-23 # ============================================================================= """ -Configuration file for 'Standard Loose Jpsi2MuMu' +Configuration file for 'Standard Loose Jpsi2MuMu'. Lifetime unbiased. """ __author__ = "Greig Cowan" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.9 $" @@ -25,9 +25,9 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseJpsi2MuMu = CombineParticles ("StdLooseJpsi2MuMu") -StdLooseJpsi2MuMu.Inputs = ["Phys/StdLooseMuons/Particles"] +StdLooseJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV)" StdLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py index 14708201a..2c79a6729 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py @@ -8,7 +8,7 @@ # @date 2009-02-18 # ============================================================================= """ -Configuration file for 'Standard Loose Jpsi2ee' +Configuration file for 'Standard Loose Jpsi2ee'. Lieftime unbiased. """ __author__ = "Patrick Koppenburg" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.6 $" @@ -25,10 +25,10 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseJpsi2ee = CombineParticles ( 'StdLooseJpsi2ee' ) -StdLooseJpsi2ee.Inputs = [ "Phys/StdLooseElectrons/Particles" ] +StdLooseJpsi2ee.Inputs = [ "Phys/StdAllLooseElectrons/Particles" ] StdLooseJpsi2ee.DecayDescriptor = "J/psi(1S) -> e+ e-" -StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV)" StdLooseJpsi2ee.MotherCut = "(VFASPF(VCHI2)<25)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py index b5ab6d97c..8c95001c2 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py @@ -4,13 +4,13 @@ # ============================================================================= ## @file CommonParticles/StdLooseKaons.py # configuration file for 'Standard Loose Kaons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Kaons' +Configuration file for 'Standard Loose Kaons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( @@ -19,19 +19,15 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker('StdLooseKaons', Particle = 'kaon' ) - -# configure the track selector -selector = trackSelector ( algorithm ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) -fltr.Selection = [ "RequiresDet='RICH' CombDLL(k-pi)>'-5.0'" ] +algorithm = FilterDesktop( 'StdLooseKaons', + Inputs = ["Phys/StdAllLooseKaons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -39,12 +35,13 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdLooseKaons = algorithm + ## ============================================================================ if '__main__' == __name__ : print __doc__ print __author__ - print __version__ + print __version__ print locationsDoD ( locations ) # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py index 24e8c6b4a..15cf569d4 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py @@ -31,7 +31,7 @@ StdLooseKsLL.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" StdLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)" } -StdLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV)" StdLooseKsLL.MotherCut = "(ADMASS('KS0') < 35.*MeV) & (VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service @@ -48,7 +48,7 @@ StdLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ] StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" StdLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)" } -StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV)" StdLooseKsDD.MotherCut = "(ADMASS('KS0') < 64.*MeV) & (VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py index ac14fe635..a6edd82ab 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py @@ -9,7 +9,7 @@ # @date 2009-06-23 # ============================================================================= """ -Configuration file for 'Standard Loose Kstar' +Configuration file for 'Standard Loose Kstar'. Lieftime unbiased. """ __author__ = "Greig Cowan" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" @@ -26,10 +26,10 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLooseKstar2Kpi = CombineParticles ("StdLooseKstar2Kpi") -StdLooseKstar2Kpi.Inputs = ["Phys/StdLooseKaons/Particles", - "Phys/StdLoosePions/Particles"] +StdLooseKstar2Kpi.Inputs = ["Phys/StdAllLooseKaons/Particles", + "Phys/StdAllLoosePions/Particles"] StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" -StdLooseKstar2Kpi.CombinationCut = "(APT > 500.*MeV) & (ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLooseKstar2Kpi.CombinationCut = "(APT > 500.*MeV) & (ADAMASS('K*(892)0') < 300.*MeV)" StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py index db36e5494..c07ff2254 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py @@ -36,7 +36,7 @@ StdLooseLambdaLL.DaughtersCuts = { "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)" } -StdLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(40, ''))" +StdLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV)" StdLooseLambdaLL.MotherCut = "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30)" ## configure Data-On-Demand service @@ -57,7 +57,7 @@ StdLooseLambdaDD.DaughtersCuts = { "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)" } -StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV)" StdLooseLambdaDD.MotherCut = "(ADMASS('Lambda0')<64*MeV) & (VFASPF(VCHI2)<25)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py index cdd37781e..2f3ca2bc8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambdac.py @@ -24,13 +24,13 @@ StdLooseLambdac2PKPi.Inputs = [ "Phys/StdLooseKaons/Particles", StdLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" StdLooseLambdac2PKPi.DaughtersCuts = { - "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", - "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))", - "p+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPCHI2DV(PRIMARY) > 4.))" + "K+" : "(P > 2*GeV)", + "pi+" : "(P > 2*GeV)", + "p+" : "(P > 2*GeV)" } -StdLooseLambdac2PKPi.CombinationCut = "(ADAMASS('Lambda_c+')<150*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50, ''))" -StdLooseLambdac2PKPi.MotherCut = "(VFASPF(VCHI2) < 30 )" +StdLooseLambdac2PKPi.CombinationCut = "((ADAMASS('Lambda_c+')<110*MeV) & (APT>1.*GeV) & (ADOCAMAX('')<0.5*mm))" +StdLooseLambdac2PKPi.MotherCut = "((VFASPF(VCHI2) < 30) & (ADMASS('Lambda_c+')<100*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" ## configure Data-On-Demand service locations = updateDoD ( StdLooseLambdac2PKPi ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py index 2bd3dd8bf..c263fed08 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py @@ -1,17 +1,17 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# $Id: StdLooseMuons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdLooseMuons.py # configuration file for 'Standard Loose Muons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Muons' +Configuration file for 'Standard Loose Muons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdLooseMuons' , @@ -19,22 +19,15 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombinedParticleMaker -from Configurables import ProtoParticleMUONFilter +from Configurables import FilterDesktop from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdLooseMuons', - Particle = 'muon' ) - -# configure the track selector -selector = trackSelector ( algorithm ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) -fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] +algorithm = FilterDesktop( 'StdLooseMuons', + Inputs = ["Phys/StdAllLooseMuons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py index a93d704c8..724369aaa 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py @@ -8,7 +8,7 @@ # @date 2009-06-23 # ============================================================================= """ -Configuration file for 'Standard Loose Phi2KK' +Configuration file for 'Standard Loose Phi2KK'. Lieftime unbiased. """ __author__ = "Greig Cowan" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.6 $" @@ -25,9 +25,9 @@ from CommonParticles.Utils import * ## ============================================================================ ## create the algorithm StdLoosePhi2KK = CombineParticles("StdLoosePhi2KK") -StdLoosePhi2KK.Inputs = ["Phys/StdLooseKaons/Particles"] +StdLoosePhi2KK.Inputs = ["Phys/StdAllLooseKaons/Particles"] StdLoosePhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" -StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30., ''))" +StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV)" StdLoosePhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py index 23b726680..14adf38eb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py @@ -4,13 +4,13 @@ # ============================================================================= ## @file CommonParticles/StdLoosePions.py # configuration file for 'Standard Loose Pions' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Pions' +Configuration file for 'Standard Loose Pions wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( @@ -19,22 +19,15 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombinedParticleMaker -from Configurables import ProtoParticleCALOFilter +from Configurables import FilterDesktop from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdLoosePions' , - Particle = 'pion' ) - -# configure the track selector -selector = trackSelector ( algorithm ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) -fltr.Selection = [ "" ] +algorithm = FilterDesktop( 'StdLoosePions', + Inputs = ["Phys/StdAllLoosePions/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py index 974790a78..02e5cbe03 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py @@ -4,13 +4,13 @@ # ============================================================================= ## @file CommonParticles/StdLooseProtons.py # configuration file for 'Standard Loose Protons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Protons' +Configuration file for 'Standard Loose Protons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( @@ -19,22 +19,15 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombinedParticleMaker -from Configurables import ProtoParticleCALOFilter +from Configurables import FilterDesktop from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdLooseProtons', - Particle = 'proton' ) - -# configure the track selector -selector = trackSelector ( algorithm ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) -fltr.Selection = [ "RequiresDet='RICH' CombDLL(p-pi)>'-5.0'" ] +algorithm = FilterDesktop( 'StdLooseProtons', + Inputs = ["Phys/StdAllLooseProtons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py index d443952b3..9ade0f779 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -28,7 +28,7 @@ StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) StdLooseRho0.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" -StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV) & (ADOCACHI2CUT(20, ''))" +StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)" StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 132faf3e8..7760a940c 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -24,10 +24,10 @@ from CommonParticles.Utils import * ## ============================================================================ StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") -StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdLooseMuons/Particles"] +StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : 'PIDmu > 0' } -StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & ADOCACHI2CUT(30., '')" +StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV)" StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py index 13b9332b8..e86505a6a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py @@ -3,14 +3,14 @@ # $Id: StdNoPIDsElectrons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdNoPIDsElectrons.py -# configuration file for 'Standard NoPIDs Pions' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# configuration file for 'Standard NoPIDs Electrons' +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Electrons' +Configuration file for 'Standard NoPIDs Electrons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( @@ -18,17 +18,16 @@ __all__ = ( 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import NoPIDsParticleMaker +from Gaudi.Configuration import * +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsElectrons' , - DecayDescriptor = 'Electron' , Particle = 'electron' ) - -# configure the track selector -selector = trackSelector ( algorithm ) +algorithm = FilterDesktop( 'StdNoPIDsElectrons', + Inputs = ["Phys/StdAllNoPIDsElectrons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -36,6 +35,7 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdNoPIDsElectrons = algorithm + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py index b64a51a45..2aae7db13 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py @@ -1,34 +1,33 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdNoPIDsKaons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# $Id: StdNoPIDsKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdNoPIDsKaons.py # configuration file for 'Standard NoPIDs Kaons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Kaons' +Configuration file for 'Standard NoPIDs Kaons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdNoPIDsKaons' , 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import NoPIDsParticleMaker +from Gaudi.Configuration import * +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsKaons' , - Particle = 'kaon' ) - -# configure the track selector -selector = trackSelector ( algorithm ) +algorithm = FilterDesktop( 'StdNoPIDsKaons', + Inputs = ["Phys/StdAllNoPIDsKaons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -36,6 +35,7 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdNoPIDsKaons = algorithm + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py index 4f98f7db3..370293bf8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py @@ -1,34 +1,33 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdNoPIDsMuons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# $Id: StdNoPIDsMuons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdNoPIDsMuons.py # configuration file for 'Standard NoPIDs Muons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Muons' +Configuration file for 'Standard NoPIDs Muons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdNoPIDsMuons' , 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import NoPIDsParticleMaker +from Gaudi.Configuration import * +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsMuons' , - Particle = 'muon' ) - -# configure the track selector -selector = trackSelector ( algorithm ) +algorithm = FilterDesktop( 'StdNoPIDsMuons', + Inputs = ["Phys/StdAllNoPIDsMuons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -36,6 +35,7 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdNoPIDsMuons = algorithm + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py index d6445f3b8..4ea394895 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py @@ -1,34 +1,33 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# $Id: StdNoPIDsPions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdNoPIDsPions.py # configuration file for 'Standard NoPIDs Pions' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Pions' +Configuration file for 'Standard NoPIDs Pions wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdNoPIDsPions' , 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import NoPIDsParticleMaker +from Gaudi.Configuration import * +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsPions' , - Particle = 'pion' ) - -# configure the track selector -selector = trackSelector ( algorithm ) +algorithm = FilterDesktop( 'StdNoPIDsPions', + Inputs = ["Phys/StdAllNoPIDsPions/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -36,6 +35,7 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdNoPIDsPions = algorithm + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py index f4ca55c23..553fe3788 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsProtons.py @@ -1,34 +1,33 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdNoPIDsProtons.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# $Id: StdNoPIDsProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdNoPIDsProtons.py # configuration file for 'Standard NoPIDs Protons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Protons' +Configuration file for 'Standard NoPIDs Protons wioth loose cuts' """ -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdNoPIDsProtons' , 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import NoPIDsParticleMaker +from Gaudi.Configuration import * +from Configurables import FilterDesktop + from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsProtons' , - Particle = 'proton' ) - -# configure the track selector -selector = trackSelector ( algorithm ) +algorithm = FilterDesktop( 'StdNoPIDsProtons', + Inputs = ["Phys/StdAllNoPIDsProtons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -36,6 +35,7 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdNoPIDsProtons = algorithm + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py deleted file mode 100755 index eb197429e..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseD02HH.py +++ /dev/null @@ -1,80 +0,0 @@ -""" -Configuration file for 'Standard Very Loose D0 -> HH' -""" -__author__ = "Liming Zhang" -__date__ = '09/12/2009' -__version__ = "version $Revision: 1.3 $" -# ============================================================================= -__all__ = ( - 'StdVeryLooseD02KPi' , - 'StdVeryLooseD02PiPi' , - 'StdVeryLooseD02KK' , - 'StdVeryLooseD02KPiDCS' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from Configurables import CombineParticles -from CommonParticles.Utils import * - -## ============================================================================ -## create the algorithm -StdVeryLooseD02KPi = CombineParticles ( 'StdVeryLooseD02KPi' ) - -StdVeryLooseD02KPi.Inputs = [ "Phys/StdLooseKaons/Particles", - "Phys/StdNoPIDsPions/Particles" ] - -StdVeryLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" - -StdVeryLooseD02KPi.DaughtersCuts = { - "K+" : "(PT>250*MeV) & (P>2*GeV) & (MIPDV(PRIMARY)>0.05*mm)", - "pi+" : "(PT>250*MeV) & (P>2*GeV) & (MIPDV(PRIMARY)>0.05*mm)" - } - -#for the mass window, need 100 MeV above the Ds mass for clean background estimation, but only need -#~150 MeV below since the lower mass sideband will be for the crystal ball only. -StdVeryLooseD02KPi.CombinationCut = " (ADAMASS('D0')<60*MeV) & (APT>1*GeV) & (ADOCACHI2CUT(20,''))" -StdVeryLooseD02KPi.MotherCut = "(VFASPF(VCHI2)<10) & (M > 1710*MeV)" - -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseD02KPi ) - -## ============================================================================ -## PiPi -StdVeryLooseD02PiPi = StdVeryLooseD02KPi.clone("StdVeryLooseD02PiPi") -StdVeryLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" -StdVeryLooseD02PiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] - -## configure Data-On-Demand service -locations.update( updateDoD ( StdVeryLooseD02PiPi ) ) - -## ============================================================================ -## KK -StdVeryLooseD02KK = StdVeryLooseD02KPi.clone("StdVeryLooseD02KK") -StdVeryLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" -StdVeryLooseD02KK.Inputs = [ "Phys/StdNoPIDsKaons/Particles" ] - -## configure Data-On-Demand service -locations.update( updateDoD ( StdVeryLooseD02KK ) ) - -## ============================================================================ -## Doubly Cabibbo suppressed -StdVeryLooseD02KPiDCS = StdVeryLooseD02KPi.clone("StdVeryLooseD02KPiDCS") -StdVeryLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" -StdVeryLooseD02KPiDCS.Inputs = [ "Phys/StdLooseKaons/Particles", - "Phys/StdNoPIDsPions/Particles" ] - -## configure Data-On-Demand service -locations.update( updateDoD ( StdVeryLooseD02KPiDCS ) ) - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py index f2a33c912..f68eaa8bb 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,11 +20,11 @@ StdVeryLooseDetachedKst2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" StdVeryLooseDetachedKst2Kpi.Inputs = ["Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles"] StdVeryLooseDetachedKst2Kpi.DaughtersCuts = { - "K+" :"(ISLONG) & (MIPCHI2DV(PRIMARY)>2.25)", - "pi-":"(ISLONG) & (MIPCHI2DV(PRIMARY)>2.25)" + "K+" :"(MIPCHI2DV(PRIMARY)>2.25)", + "pi-":"(MIPCHI2DV(PRIMARY)>2.25)" } -StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV) & (ADOCACHI2CUT(30,''))" +StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV)" StdVeryLooseDetachedKst2Kpi.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdVeryLooseDetachedKst2Kpi) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py index 4126905e3..5f77797a4 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py @@ -17,8 +17,8 @@ import GaudiKernel.SystemOfUnits as Units StdVeryLooseDiMuon = CombineParticles("StdVeryLooseDiMuon") StdVeryLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdVeryLooseDiMuon.Inputs = ["Phys/StdVeryLooseMuons/Particles"] -StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV) & (ADOCACHI2CUT(30.,''))" +StdVeryLooseDiMuon.Inputs = ["Phys/StdAllVeryLooseMuons/Particles"] +StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV)" StdVeryLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25.)" locations = updateDoD(StdVeryLooseDiMuon) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py deleted file mode 100755 index bd6e882a7..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDplus.py +++ /dev/null @@ -1,73 +0,0 @@ -""" -Configuration file for 'Standard VeryLoose Dplus' -""" -__author__ = "Liming Zhang" -__date__ = '09/12/2009' -__version__ = "version $Revision: 1.1 $" -# ============================================================================= -__all__ = ( - 'StdVeryLooseDplus2KPiPi' , - 'StdVeryLooseDplus2KKPi' , - 'StdVeryLooseDplus2PiPiPi' , - 'StdVeryLooseDplus2KPiPiOppSignPi' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from Configurables import CombineParticles -from CommonParticles.Utils import * - -## ============================================================================ -## create the algorithm -StdVeryLooseDplus2KPiPi = CombineParticles ( 'StdVeryLooseDplus2KPiPi' ) - -StdVeryLooseDplus2KPiPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", - "Phys/StdNoPIDsPions/Particles" ] -StdVeryLooseDplus2KPiPi.DecayDescriptor = "[D+ -> K- pi+ pi+]cc" -StdVeryLooseDplus2KPiPi.DaughtersCuts = { - "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", - "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))" - } - -#Need an upper mass window of 150 MeV for background estimation -#and a lower mass window of 250 to catch the D+ and Ds -StdVeryLooseDplus2KPiPi.CombinationCut = "(ADAMASS('D_s+')<250*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50.,''))" -StdVeryLooseDplus2KPiPi.MotherCut = "(VFASPF(VCHI2) < 30 ) & (M < 2120.*MeV) " - -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDplus2KPiPi ) - -########################################################################################## -# D+ -> K K Pi is a clone of D+ -> K Pi Pi -# -StdVeryLooseDplus2KKPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2KKPi") -StdVeryLooseDplus2KKPi.DecayDescriptor = "[D+ -> K- K+ pi+]cc" -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDplus2KKPi ) -########################################################################################## -# D+ -> 3 pi is a clone of D+ -> K Pi Pi -# -StdVeryLooseDplus2PiPiPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2PiPiPi") -StdVeryLooseDplus2PiPiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles" ] -StdVeryLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDplus2PiPiPi ) -########################################################################################## -# Also need the opposite sign pions mode for the Ds -# -StdVeryLooseDplus2KPiPiOppSignPi = StdVeryLooseDplus2KPiPi.clone("StdVeryLooseDplus2KPiPiOppSignPi") -StdVeryLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDplus2KPiPiOppSignPi ) - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py deleted file mode 100644 index 10add670c..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDstarWithD2HH.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python -# ============================================================================= -# $Id: StdVeryLooseDstarWithD2HH.py,v 1.5 2010-09-05 20:36:44 gcowan Exp $ -# ============================================================================= -## @file CommonParticles/StdVeryLooseDstarWithD02HH.py -# configuration file for 'Standard VeryLoose Dstar WithD02HH' -# similar to StdLooseDstarWithD2HH.py but using Very Loose D0 -# and also StdNoPIDsUpPions to make the D* slow pion. Add two cuts on slow pion. -# ============================================================================= -""" -Configuration file for 'Standard VeryLoose Dstar WithD02HH' -""" -__author__ = "Marta Calvi" -__date__ = '10/12/2009' -__version__ = "version $Revision: 1.5 $" - -# ============================================================================= -__all__ = ( - 'StdVeryLooseDstarWithD02KPi' , - 'StdVeryLooseDstarWithD02KPiDCS' , - 'StdVeryLooseDstarWithD02PiPi' , - 'StdVeryLooseDstarWithD02KK' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from Configurables import CombineParticles -from CommonParticles.Utils import * - -## ============================================================================ -## create the algorithm -StdVeryLooseDstarWithD02KPi = CombineParticles ( 'StdVeryLooseDstarWithD02KPi' ) - -StdVeryLooseDstarWithD02KPi.Inputs = [ "Phys/StdNoPIDsPions/Particles", - "Phys/StdVeryLooseD02KPi/Particles" ] -StdVeryLooseDstarWithD02KPi.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" - -StdVeryLooseDstarWithD02KPi.CombinationCut = "(ADAMASS('D*(2010)+')<80*MeV) & (APT>1250*MeV)" -StdVeryLooseDstarWithD02KPi.MotherCut = "(VFASPF(VCHI2/VDOF)<25) & (M-MAXTREE('D0'==ABSID,M)<165.5)" -StdVeryLooseDstarWithD02KPi.DaughtersCuts = {"pi+" : "(PT>110*MeV) & (MIPDV(PRIMARY)>0.04*mm)"} - -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDstarWithD02KPi ) - -################################################################################ -# D* with Cabibbo-suppressed D0->K+Pi- is a clone of D* with D0->KPi -# -StdVeryLooseDstarWithD02KPiDCS = StdVeryLooseDstarWithD02KPi.clone("StdVeryLooseDstarWithD02KPiDCS") -GaudiSequencer("SeqStdVeryLooseDstarWithD02KPiDCS").Members += [ StdVeryLooseDstarWithD02KPiDCS ] -StdVeryLooseDstarWithD02KPiDCS.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" -StdVeryLooseDstarWithD02KPiDCS.Inputs = [ "Phys/StdNoPIDsPions/Particles", - "Phys/StdVeryLooseD02KPiDCS/Particles" ] -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDstarWithD02KPiDCS ) - -################################################################################ -# D* with D0->KK is a clone of D* with D0->Kpi -# -StdVeryLooseDstarWithD02KK = StdVeryLooseDstarWithD02KPi.clone("StdVeryLooseDstarWithD02KK") -GaudiSequencer("SeqStdVeryLooseDstarWithD02KK").Members += [ StdVeryLooseDstarWithD02KK ] -StdVeryLooseDstarWithD02KK.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" -StdVeryLooseDstarWithD02KK.Inputs = [ "Phys/StdNoPIDsPions/Particles", - "Phys/StdVeryLooseD02KK/Particles" ] -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDstarWithD02KK ) - -################################################################################ -# D* with D0->PiPi is a clone of D* with D0->KK -# -StdVeryLooseDstarWithD02PiPi = StdVeryLooseDstarWithD02KK.clone("StdVeryLooseDstarWithD02PiPi") -GaudiSequencer("SeqStdVeryLooseDstarWithD02PiPi").Members += [ StdVeryLooseDstarWithD02PiPi ] -StdVeryLooseDstarWithD02PiPi.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc" -StdVeryLooseDstarWithD02PiPi.Inputs = [ "Phys/StdNoPIDsPions/Particles", - "Phys/StdVeryLooseD02PiPi/Particles" ] -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseDstarWithD02PiPi ) - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py index 4ff5a7671..ee5354ce9 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py @@ -27,7 +27,7 @@ from CommonParticles.Utils import * StdVeryLooseJpsi2MuMu = CombineParticles ("StdVeryLooseJpsi2MuMu") StdVeryLooseJpsi2MuMu.Inputs = ["Phys/StdVeryLooseMuons/Particles"] StdVeryLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30.,''))" +StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV)" StdVeryLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py deleted file mode 100755 index 6f860d635..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambdac.py +++ /dev/null @@ -1,47 +0,0 @@ -""" -Configuration file for 'Standard VeryLoose Lambda_c+' -""" -__author__ = "Liming Zhang" -__date__ = '09/12/2009' -__version__ = "version $Revision: 1.1 $" -# ============================================================================= -__all__ = ( - 'StdVeryLooseLambdac2PKPi' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from Configurables import CombineParticles -from CommonParticles.Utils import * - -## ============================================================================ -## create the algorithm -StdVeryLooseLambdac2PKPi = CombineParticles ( 'StdVeryLooseLambdac2PKPi' ) - -StdVeryLooseLambdac2PKPi.Inputs = [ "Phys/StdNoPIDsKaons/Particles", - "Phys/StdNoPIDsPions/Particles", - "Phys/StdNoPIDsProtons/Particles" ] -StdVeryLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" -StdVeryLooseLambdac2PKPi.DaughtersCuts = { - "K+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", - "pi+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))", - "p+" : "((PT >250*MeV) & (P > 2*GeV) & (MIPDV(PRIMARY)>0.05*mm))" - } - -StdVeryLooseLambdac2PKPi.CombinationCut = "(ADAMASS('Lambda_c+')<150*MeV) & (APT>1.*GeV) & (ADOCACHI2CUT(50.,''))" -StdVeryLooseLambdac2PKPi.MotherCut = "(VFASPF(VCHI2) < 30 )" - -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseLambdac2PKPi ) - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py index f54d55992..abf127ad9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py @@ -1,17 +1,17 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdVeryLooseMuons.py,v 1.1 2009-10-08 12:37:06 pkoppenb Exp $ +# $Id: StdLooseMuons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdVeryLooseMuons.py -# configuration file for 'Standard Very Loose Muons' -# @author Patrick Koppenburg patrick.koppenburg@cern.ch -# @date 2009-10-08 +# configuration file for 'Standard Loose Muons' +# @author Patrick Koppenburg +# @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Very Loose Muons' +Configuration file for 'Standard Loose Muons woth loose cuts' """ -__author__ = "Patrick Koppenburg patrick.koppenburg@cern.ch" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( 'StdVeryLooseMuons' , @@ -19,22 +19,15 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombinedParticleMaker -from Configurables import ProtoParticleMUONFilter +from Configurables import FilterDesktop from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdVeryLooseMuons', - Particle = 'muon' ) - -# configure the track selector -selector = trackSelector ( algorithm ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) -fltr.Selection = [ "RequiresDet='MUON' IsMuonLoose=True" ] +algorithm = FilterDesktop( 'StdVeryLooseMuons', + Inputs = ["Phys/StdAllVeryLooseMuons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/Utils.py b/Phys/CommonParticles/python/CommonParticles/Utils.py index 6c5ce183c..1feb3f263 100755 --- a/Phys/CommonParticles/python/CommonParticles/Utils.py +++ b/Phys/CommonParticles/python/CommonParticles/Utils.py @@ -20,6 +20,7 @@ __all__ = ( 'particles' , ## locations, known for data-on-demand service 'trackSelector' , ## get the track selector 'protoFilter' , ## filter for (charged) protoparticles + 'defaultCuts' , ## Default PT and IP cuts ) # ============================================================================= @@ -31,12 +32,25 @@ from Configurables import LHCbConfigurableUser # local storage of data-on-demand actions _particles = {} +# Default cuts +_defaultCuts = "(PT>250*MeV) & (MIPCHI2DV(PRIMARY) > 4.)" + +# ============================================================================= +# Default Cuts +def defaultCuts(): + """ + Return string with default cuts + """ + return _defaultCuts + +# ============================================================================= # ============================================================================= ## @class DefaultTrackingCuts # Little class to hold default track selection criteria class DefaultTrackingCuts(LHCbConfigurableUser) : ## Configuration slots - __slots__ = { "Cuts" : { "Chi2Cut" : [ 0, 5 ] }, ## The cuts to apply + __slots__ = { "Cuts" : { "Chi2Cut" : [ 0, 5 ], + "CloneDistCut" : [5000, 9e+99 ] }, ## The cuts to apply "Types" : ["Long"] ## The track types to include } @@ -87,7 +101,9 @@ def trackSelector ( alg , for name,cut in cuts.iteritems() : selector.setProp("Min"+name,cut[0]) selector.setProp("Max"+name,cut[1]) - + if ( "CloneDistCut"==name): selector.setProp("AcceptClones",False) +# selector.MinPtCut = 100000000 + return selector ## get the protoparticle filter diff --git a/Phys/CommonParticles/tests/test_inputlocations_consistency.py b/Phys/CommonParticles/tests/test_inputlocations_consistency.py index 89ae4eb57..74b16ede6 100755 --- a/Phys/CommonParticles/tests/test_inputlocations_consistency.py +++ b/Phys/CommonParticles/tests/test_inputlocations_consistency.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #$Id: test_load_modules.py,v 1.1 2010-04-22 14:44:53 jpalac Exp $ ''' -Test loading various CommonParticles in the Analysis environment. Needs to be extended. +Test loading various CommonParticles in the Stripping environment. Needs to be extended. ''' __author__ = 'Juan Palacios juan.palacios@nikhef.nl' -- GitLab From 29793312c126aa30c6dff678ea41c5d5e327cd20 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:02:47 +0100 Subject: [PATCH 08/50] v2r5p1 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 169 +++++++++--------- .../python/CommonParticles/StdLooseD02HH.py | 28 +-- .../CommonParticles/StdLooseDetachedPhi.py | 16 +- .../CommonParticles/StdLooseDiElectron.py | 6 +- .../python/CommonParticles/StdLooseDiMuon.py | 5 +- .../CommonParticles/StdLooseDiMuonSameSign.py | 5 +- .../CommonParticles/StdLooseJpsi2MuMu.py | 16 +- .../python/CommonParticles/StdLooseJpsi2ee.py | 16 +- .../python/CommonParticles/StdLooseKs.py | 4 +- .../python/CommonParticles/StdLooseKstar.py | 14 +- .../python/CommonParticles/StdLooseLambda.py | 4 +- .../python/CommonParticles/StdLoosePhi.py | 16 +- .../python/CommonParticles/StdLooseRho0.py | 14 +- .../StdMassConstrainedJpsi2MuMu.py | 10 +- .../StdVeryLooseDetachedKstar.py | 2 +- .../CommonParticles/StdVeryLooseDiMuon.py | 6 +- .../CommonParticles/StdVeryLooseJpsi2MuMu.py | 16 +- 19 files changed, 180 insertions(+), 171 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index a2a1dc56b..cbf19f20b 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r3 +version v8r4 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 95f237c36..75ce650ad 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r3 +v8r4 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 728fbbceb..007794b04 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,13 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r4 2011-08-04 ========================= +! 2011-08-03 - Rob Lambert + - Add in ADOCACHI2 to all two body decays, add EOL native everywhere + +! 2011-08-03 - Rob Lambert + - Rolf added back in the ADOCACHI2 cuts to Ks and lambda, it improves the timing by a lot. + !========================= CommonParticles v8r3 2011-07-22 ========================= ! 2011-07-21 - Patrick Koppenburg - Fix tests: @@ -20,17 +27,17 @@ ! 2011-07-18 - Patrick Koppenburg * * MAJOR CHANGE : PLEASE READ -* +* - New Default Tracking cut removing clones - New default PT>250MeV and IPCHI2>4 cut for all charged basic - Added new StdAllLooseXxx and StdAllNoPIDsXxx (Xxx=Pions,Muons,Kaons,Protons,Electrons) and StdAllVeryLooseMuons that do no implement PT>250MeV and IPCHI2>4 cut - - Changed StdLooseXxx, StdNoPIDsXxx and StdVeryLooseMuons to use the new particles - and implement the new default cuts - + - Changed StdLooseXxx, StdNoPIDsXxx and StdVeryLooseMuons to use the new particles + and implement the new default cuts + WARNING : Now all StdLooseXxx and StdNoPIDsXxx have PT>250MeV and IPCHI2>4 - - The following intermediate states have been changed to use the new StdAll + - The following intermediate states have been changed to use the new StdAll particles: StdLooseDiElectron @@ -73,7 +80,7 @@ ! 2011-02-21 - Juan Palacios - StdLooseKs, StdVeryLooseD02HH, StdLooseDstarWithD2HH, StdLooseD02HH - . Bug fix: locations map was being over-written, keeping info for last + . Bug fix: locations map was being over-written, keeping info for last common particles only. - All CommonParticles . Set complete InputLocations paths: "Phys/<alg name>/Particles" @@ -113,7 +120,7 @@ ! 2010-10-01 - Jibo He - python/CommonParticles/StdLooseDiMuon.py - . Removed mass cut + . Removed mass cut - python/CommonParticles/StdLooseDiMuonSameSign.py + Added same sign loose dimuon @@ -127,31 +134,31 @@ ! 2010-09-20 - Juan Palacios - python/CommonParticles/StdLooseRho0.py - . Remove StdLooseRho0.DaughtersCuts = { "pi+" : "TRUE" }. This cut is + . Remove StdLooseRho0.DaughtersCuts = { "pi+" : "TRUE" }. This cut is unnecessary and doesn't work anyway. ! 2010-09-20 - Thomas Blake - Updated to use ADCOACHI2CUT instead of ADOCACHI2 ! 2010-09-17 - Thomas Blake - - Updated trackSelector cuts for StdNoPIDsDowns{Pions/Protons} to + - Updated trackSelector cuts for StdNoPIDsDowns{Pions/Protons} to Chi2Cut < 10 - Added ADOCACHI2 cuts to numerous common particles and removed explicit track chi2 requirements. - Updated StdLooseLambdac to use StdLoose particles. ! 2010-09-17 - Greig Cowan - - Added ADOCACHI2 cuts to most of the common particles to speed up their + - Added ADOCACHI2 cuts to most of the common particles to speed up their creation. Also removed TRCHI2NDOF cuts since defaults are now set to <5. ! 2010-09-16 - Chris Jones - Update the default tracking cuts as applied to all common particles, via the DefaultTrackingCuts Configurable in Utils.py - Previously the default was for no additional track selection cuts to be + Previously the default was for no additional track selection cuts to be applied when creating Particles from ProtoParticles. Now the default cut is chi^2 < 5 - I also removed the method useCutSet, which is really redundant as the default - cuts can just be set directly. Also, doing this should really be + cuts can just be set directly. Also, doing this should really be discouraged and removing the method does this ... ! 2010-09-09 - Juan Palacios @@ -176,8 +183,8 @@ ! 2010-08-24 Greig Cowan - Added new StdMassConstrainedJpsi2MuMu for use by beta_s B2JpsiX selections. -! 2010-08-24 Yasmine Amhis - - Change track chi2/ndof (20 -> 10) cut of pions and proton in StdLooseLambda.py +! 2010-08-24 Yasmine Amhis + - Change track chi2/ndof (20 -> 10) cut of pions and proton in StdLooseLambda.py ! 2010-08-11 - Ulrich Kerzel - Add StdNoPIDsElectrons for Upstream, Downstream and VELO tracks @@ -185,7 +192,7 @@ ! 2010-08-10 - V. Gligorov - Add a generic D+->hhh to StdLooseDplus, using the WM functors to prevent multiple - combinatorics. + combinatorics. !========================== CommonParticles v7r3 2010-06-24 =================== @@ -247,7 +254,7 @@ - Added StdVeryLooseDstarWithD2HH (Marta Calvi) ! 2009-12-14 - Anton Poluektov - - Added StdVeryLooseD0HH, StdVeryLooseDplus and StdVeryLooseLambdac by Liming Zhang. + - Added StdVeryLooseD0HH, StdVeryLooseDplus and StdVeryLooseLambdac by Liming Zhang. ! 2009-12-09 - Patrick Koppenburg - New StdLooseDiElectron, a copy of the StdLooseDiMuon @@ -283,9 +290,9 @@ !========================= CommonParticles v6r0 2009-07-21 =================== ! 2009-07-21 - Chris Jones - - Update Track selection so default cuts set is now NULL (I.e. no cuts) + - Update Track selection so default cuts set is now NULL (I.e. no cuts) following requests from the physics working groups. - + This can be changed via :- from CommonParticles.Utils import DefaultTrackingCuts @@ -321,12 +328,12 @@ - Add StdLooseDiMuon to StandardDiMuon ! 2009-07-08 - Chris Jones - - Update Track selection to make it easy for users to re-define the default + - Update Track selection to make it easy for users to re-define the default cuts in their DaVinci.py options files, e.g. :- from CommonParticles.Utils import DefaultTrackingCuts DefaultTrackingCuts().Cuts = { } # Make default no cuts - DefaultTrackingCuts().Types = ["Long"] + DefaultTrackingCuts().Types = ["Long"] ! 2009-07-07 - Rob Lambert - Added a StdLooseDiMuon. Cuts are:- @@ -340,13 +347,13 @@ - Increment to v6r0 ! 2009-07-01 - Chris Jones - - Add loose(ish) track selection cuts to all Standard charged Particles. + - Add loose(ish) track selection cuts to all Standard charged Particles. Cuts are :- Chi^2 / d.o.f. < 10 Likilihood > -100 CloneDist > -1e10 GhostProb < 0.99 - Current cuts are just a suggestion (motivated by those used in the RICH + Current cuts are just a suggestion (motivated by those used in the RICH reconstruction) and included as a starting point for discussion with the physics working groups. @@ -356,16 +363,16 @@ - Added vertex chi2 cut to StdLooseJpsi2MuMu and StdLoosePhi2KK. ! 2009-06-28 - Greig Cowan - - Removed StdLooseUnbiasedPhi2KK. Added StdLooseDetachedPhi with K IP cut. New - StdLoosePhi2KK only has upper mass window on the phi. New StdLooseJpsi2MuMu + - Removed StdLooseUnbiasedPhi2KK. Added StdLooseDetachedPhi with K IP cut. New + StdLoosePhi2KK only has upper mass window on the phi. New StdLooseJpsi2MuMu only has mass window. StdLooseKstar added to be compatible with beta_s roadmap Bd2JspiKstar selection. Appropriate stripping and ccbar selections have been updated to use these particles and have been successfully tested. !========================== CommonParticles v5r3 2009-06-23 =================== ! 2009-06-12 - Patrick Koppenburg - - Adapt NoPIDs options not to use obsolete options UseDownstreamTracks - and similar. Requires tag pkoppenb_20090612 of ParticleMaker. + - Adapt NoPIDs options not to use obsolete options UseDownstreamTracks + and similar. Requires tag pkoppenb_20090612 of ParticleMaker. - Increment to v5r3 !========================== CommonParticles v5r2 2009-06-03 ================== @@ -374,10 +381,10 @@ - Using StdNoPIDsDownPions for the KsDD. ! 2009-05-21 - Greig Cowan - - Reverted StdLooseJpsi2MuMu to only make the loose Jpsi's. The FilterDesktop code - for the lifetime unbiased Jpsi has been moved into it's own file: - StdLTUnbiasedJpsi2MuMu.py. This particle has been added to StandardJpsi.py. The - lifetime unbiased selection is based on the one in described in LHCb-2009-025 + - Reverted StdLooseJpsi2MuMu to only make the loose Jpsi's. The FilterDesktop code + for the lifetime unbiased Jpsi has been moved into it's own file: + StdLTUnbiasedJpsi2MuMu.py. This particle has been added to StandardJpsi.py. The + lifetime unbiased selection is based on the one in described in LHCb-2009-025 and the beta_s roadmap. ! 2009-05-21 - Vanya BELYAEV @@ -395,7 +402,7 @@ the charged D and Ds at this loose level. The mass window is large enough to accomodate both, as described in the log entry below. If your selection is broken, just switch to StdLooseDplus. You will also need to change the Ds to a D+ in your decay - descriptors. + descriptors. ! 2009-05-20 - V. Gligorov - Updated the cuts for the standard D0 to bring it into line with what will be @@ -426,11 +433,11 @@ !========================== CommonParticles v5r0p1 2009-04-08 ================ -! 2008-04-03 - Olivier Deschamps +! 2008-04-03 - Olivier Deschamps - adapt options and python to change in calo ParticleMaker (property name changes for pi0Makers) ! 2009-03-25 - Patrick Koppenburg - - Bug fix in StdLooseD02HH : All states except D0->Kpi were called Standard + - Bug fix in StdLooseD02HH : All states except D0->Kpi were called Standard instead of Std. !========================== CommonParticles v5r0 2009-03-01 ================== @@ -442,12 +449,12 @@ - PhysDesktop() -> PhysDesktop ! 2009-02-18 - Patrick Koppenburg - - Move all intermediate states to python + - Move all intermediate states to python - They are now based on Hlt2, not DC06 anymore - Most of this is untested - Removed all options/Standard*.opts - Removed options/StandardOptions.py (requires latest version of AnalysisConf) - - Keep only DC06 stuff in options/ + - Keep only DC06 stuff in options/ - options/ directory declared obsolete. Do not edit. - Increment to v5r0 @@ -458,7 +465,7 @@ - The first attempt to provide 'configurables' for standard particles. all modules configurables are available in python/CommonParticles directory. - Basic: + Basic: StdLoosePions StdLooseKaons @@ -478,60 +485,60 @@ StdNoPIDsProtons StdNoPIDsElectrons - StdLoosePhotons - StdLooseCnvPhotons - StdLooseAllPhotons - + StdLoosePhotons + StdLooseCnvPhotons + StdLooseAllPhotons + Collections: - StandardPions + StandardPions StandardKaons - StandardMuons + StandardMuons StandardProtons StandardElectrons StandardPhotons - StandardBasicCharged + StandardBasicCharged StandardBasicNeutral StandardBasic - - The usage is fairly trivial, e.g.: - - import CommonParticles.StdLoosePions - or: + The usage is fairly trivial, e.g.: + + import CommonParticles.StdLoosePions + + or: import CommonParticles.StandardMuons - or: + or: - import CommonParticles.StandardBasic + import CommonParticles.StandardBasic The loaded content could always be inspected using: - from CommonParticles.Utils import locationsDoD - print locationsDoD() + from CommonParticles.Utils import locationsDoD + print locationsDoD() - Also one can always get the actial algorithms(configurables), + Also one can always get the actial algorithms(configurables), which are responsible for the given equipped locations: - - >>> from CommonParticles.Utils import particles - >>> parts = particles() + + >>> from CommonParticles.Utils import particles + >>> parts = particles() >>> for location in parts : - ... print 'location :' % location + ... print 'location :' % location ... conf = parts[location] - ... print ' configurable: ' % conf.name() - + ... print ' configurable: ' % conf.name() + Each file can be inspected from the common line: - - python StandardBasicCharged.py + python StandardBasicCharged.py - cmt/requirments: - version increment to v4r2 + cmt/requirments: + + version increment to v4r2 ! 2009-01-09 - Patrick Koppenburg for Diego Martinez Santos @@ -556,13 +563,13 @@ !========================== CommonParticles v4r1 2008-09-10 =================== ! 2008-09-09 - Patrick Koppenburg - - Standard pions : added some more + - Standard pions : added some more !========================== CommonParticles v4r0 2008-08-05 =================== ! 2008-07-11 - Patrick Koppenburg - Copied all Standard*.opts to StandradDC06*.opts. These are now obsolete and will not be touched. - - The remaining Standard*.opts can be translated to Standard*.py. + - The remaining Standard*.opts can be translated to Standard*.py. - Increment to v4r0 !========================== CommonParticles v3r13 2008-07-11 ================== @@ -572,7 +579,7 @@ !========================== CommonParticles v3r12 2008-04-24 ================== ! 2008-04-11 - Patrick Koppenburg - - No tabs in options + - No tabs in options ! 2008-03-14 - Patrick Koppenburg - do not print options @@ -663,7 +670,7 @@ ! 2007-01-16 - Juan PALACIOS - Remove src/CommonParticles_load.cpp and _dll.cpp - + ! 2007-01-16 - P. Koppenburg - options/StandardD0.opts . Apply Pt cut before vertex fit not after. @@ -674,9 +681,9 @@ ! 2006-12-22 - Juan Palacios for Andy Powell - options/StandardD0.opts - . New D0 types: + . New D0 types: Replace StdLooseD02KKPiPi for StdLooseD02KKPiPiNoCC and - StdLooseD02KPiPiPi for StdLooseD02KPiPiPiCA. + StdLooseD02KPiPiPi for StdLooseD02KPiPiPiCA. Remove StdLooseD02KPiPiPiDCS. - cmt/requirements @@ -686,7 +693,7 @@ - Apply an (temporary) correction on Brem. energy ! 2006-12-12 - Jan Amoraal - - Relax Jpsi VChi2 cut, from 6 -> 15, for Flavour Tagging WG + - Relax Jpsi VChi2 cut, from 6 -> 15, for Flavour Tagging WG ! 2006-12-12 - Juan PALACIOS @@ -711,11 +718,11 @@ . Increment version to v3r5 ! 2006-11-28 - Olivier Deschamps - - fix StandardResolvedPi0s.optsS & standardMergedPi0s.opts + - fix StandardResolvedPi0s.optsS & standardMergedPi0s.opts ! 2006-11-28 - Juan PALACIOS - - options/ + - options/ add StandardResolvedPi0s.optsS & standardMergedPi0s.opts - update StandardPhotons.opts + update StandardPhotons.opts !========================== CommonParticles v3r4 2006-11-16 =================== @@ -791,7 +798,7 @@ - options . new files for standard electrons, muons, pions, kaons, protons, and photons a la DC06. - . StandardParticles.opts now includes these files. + . StandardParticles.opts now includes these files. . Photons not ready yet so commented out. . Electrons missing AddBremPhoton functionality @@ -837,13 +844,13 @@ ! 2006-05-20 - V. Gligorov - options/StandardD0.opts - . Restored pt cut on D0 to 1000 MeV + . Restored pt cut on D0 to 1000 MeV ! 2006-05-19 - P. Koppenburg - options/DVTestStandardParticles.opts - options/StandardOptions.opts . Added StandardDplus - - options/StandardKstar.opts + - options/StandardKstar.opts . Window widened to +/-300MeV ! 2006-05-19 - V. Gligorov @@ -861,7 +868,7 @@ - options/StandardRho0.opts . New options. -! 2006-05-18 - P. Koppenburg +! 2006-05-18 - P. Koppenburg - options/StandardKs.opts . Added options by Cristina Lazzeroni - options/StandardD0.opts @@ -872,13 +879,13 @@ . Test D0->KsHH !========================== CommonParticles v2r1 2006-04-28 =================== -! 2006-04-28 - P. Koppenburg +! 2006-04-28 - P. Koppenburg - options/StandardDstar.opts . Bug fix: Chi2 and mass difference were cut actually ignored . Change mass difference cut from 10 to 20 MeV !========================== CommonParticles v2r0 2006-02-03 =================== -! 2006-01-31 - P. Koppenburg +! 2006-01-31 - P. Koppenburg - options/MergedPi0Alg.opts - options/ResolvedPi0Alg.opts - options/ProducePairPhotons.opts @@ -917,7 +924,7 @@ !==================== CommonParticle v1r5 2004-06-04 ======================== ! 2004-06-03 - P. Koppenburg for O. Deschamps - MergedPi0Alg.opts - . MergedPi0Alg.ParMas={ 1.008 , 0.0658E-03 , 0.1276E-04 }; + . MergedPi0Alg.ParMas={ 1.008 , 0.0658E-03 , 0.1276E-04 }; because of new calo calibration ! 2004-05-11 - P. Koppenburg for O. Deschamps @@ -927,7 +934,7 @@ !==================== CommonParticle v1r4 2004-05-05 ======================== ! 2004-04-28 - R.Beneyton - - ProducePairPhoton (h/src/opts): update to new DVAlg + - ProducePairPhoton (h/src/opts): update to new DVAlg . getInput, loadtools in code with flag off . DecayDescriptor, Outputlocation in opts files diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py index 7a9d64c0e..95499687e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02HH.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseD02HH.py,v 1.8 2009-07-10 03:05:14 gligorov Exp $ +# $Id: StdLooseD02HH.py,v 1.8 2009-07-10 03:05:14 gligorov Exp $ # ============================================================================= ## @file CommonParticles/StdLooseD02HH.py -# configuration file for 'Standard Loose D0 -> HH' +# configuration file for 'Standard Loose D0 -> HH' # @author Patrick Koppenburg # @date 2009-02-18 # ============================================================================= @@ -26,23 +26,23 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLooseD02KPi = CombineParticles ( 'StdLooseD02KPi' ) StdLooseD02KPi.Inputs = [ "Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles" ] -StdLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" +StdLooseD02KPi.DecayDescriptor = "[D0 -> K- pi+]cc" StdLooseD02KPi.DaughtersCuts = { "K+" : "(P>2*GeV)", "pi+" : "(P>2*GeV)"} -#for the mass window, need 100 MeV above the Ds mass for clean background estimation, but only need -#~100 MeV below since the lower mass sideband will be for the crystal ball only. +#for the mass window, need 100 MeV above the Ds mass for clean background estimation, but only need +#~100 MeV below since the lower mass sideband will be for the crystal ball only. -StdLooseD02KPi.CombinationCut = "(((APT>1*GeV) | (ASUM(PT)>1.2*GeV)) & (ADAMASS('D0')<110*MeV) & (ADOCA(1,2)<0.5*mm))" +StdLooseD02KPi.CombinationCut = "(((APT>1*GeV) | (ASUM(PT)>1.2*GeV)) & (ADAMASS('D0')<110*MeV) & (ADOCA(1,2)<0.5*mm) & (ADOCACHI2CUT(15,'')))" StdLooseD02KPi.MotherCut = "((VFASPF(VCHI2)<10) & (ADMASS('D0')<100*MeV) & (BPVVDCHI2>36))" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLooseD02KPi ) ## ============================================================================ @@ -50,7 +50,7 @@ locations = updateDoD ( StdLooseD02KPi ) StdLooseD02PiPi = StdLooseD02KPi.clone("StdLooseD02PiPi") StdLooseD02PiPi.DecayDescriptor = "[D0 -> pi- pi+]cc" -## configure Data-On-Demand service +## configure Data-On-Demand service locations.update( updateDoD ( StdLooseD02PiPi ) ) ## ============================================================================ @@ -58,15 +58,15 @@ locations.update( updateDoD ( StdLooseD02PiPi ) ) StdLooseD02KK = StdLooseD02KPi.clone("StdLooseD02KK") StdLooseD02KK.DecayDescriptor = "[D0 -> K- K+]cc" -## configure Data-On-Demand service +## configure Data-On-Demand service locations.update( updateDoD ( StdLooseD02KK ) ) ## ============================================================================ ## Doubly Cabibbo suppressed StdLooseD02KPiDCS = StdLooseD02KPi.clone("StdLooseD02KPiDCS") -StdLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" +StdLooseD02KPiDCS.DecayDescriptor = "[D0 -> K+ pi-]cc" -## configure Data-On-Demand service +## configure Data-On-Demand service locations.update( updateDoD ( StdLooseD02KPiDCS ) ) ## ============================================================================ @@ -75,8 +75,8 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) # ============================================================================= -# The END +# The END # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py index 87b37003d..e8b90fd6c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedPhi.py @@ -1,9 +1,9 @@ ##!/usr/bin/env python # ============================================================================= -# $Id: StdLooseDetachedPhi.py,v 1.2 2009-07-10 15:19:54 gcowan Exp $ +# $Id: StdLooseDetachedPhi.py,v 1.2 2009-07-10 15:19:54 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdLooseDetachedPhi2KK.py -# configuration file for 'Standard Loose Detached' +# configuration file for 'Standard Loose Detached' # @author Greig Cowan # @date 2009-06-23 # ============================================================================= @@ -23,15 +23,15 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLooseDetachedPhi2KK = CombineParticles ("StdLooseDetachedPhi2KK") StdLooseDetachedPhi2KK.Inputs = ["Phys/StdLooseKaons/Particles"] -StdLooseDetachedPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" -StdLooseDetachedPhi2KK.DaughtersCuts = {"K+": "(MIPCHI2DV(PRIMARY) > 4.)"} -StdLooseDetachedPhi2KK.CombinationCut = "(AM < 1100.*MeV)" +StdLooseDetachedPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" +StdLooseDetachedPhi2KK.DaughtersCuts = {"K+": "(MIPCHI2DV(PRIMARY) > 4.)"} +StdLooseDetachedPhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30,''))" StdLooseDetachedPhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLooseDetachedPhi2KK ) ## ============================================================================ @@ -40,4 +40,4 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index a92cbe52e..bab85b275 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -7,7 +7,7 @@ __date__ = '08/12/2009' from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles from CommonParticles.Utils import * import GaudiKernel.SystemOfUnits as Units @@ -18,7 +18,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiElectron = CombineParticles("StdLooseDiElectron") StdLooseDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] -StdLooseDiElectron.CombinationCut = "(AM>30*MeV)" +StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30,''))" StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDiElectron) @@ -29,5 +29,5 @@ if '__main__' == __name__ : print __author__ print __version__ print locationsDoD ( locations ) - + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py index 1ac731fe9..d1ba29647 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuon.py @@ -7,7 +7,7 @@ __date__ = '07/07/2009' from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles from CommonParticles.Utils import * import GaudiKernel.SystemOfUnits as Units @@ -18,6 +18,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiMuon = CombineParticles("StdLooseDiMuon") StdLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdLooseDiMuon.Inputs = ["Phys/StdAllLooseMuons/Particles"] +StdLooseDiMuon.CombinationCut="(ADOCACHI2CUT(30, ''))" StdLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25)" locations = updateDoD(StdLooseDiMuon) @@ -28,5 +29,5 @@ if '__main__' == __name__ : print __author__ print __version__ print locationsDoD ( locations ) - + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py index 690b5ce66..178cca43a 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiMuonSameSign.py @@ -3,7 +3,7 @@ Configuration file for Standard Loose DiMuon """ from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles from CommonParticles.Utils import * import GaudiKernel.SystemOfUnits as Units @@ -14,6 +14,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiMuonSameSign = CombineParticles("StdLooseDiMuonSameSign") StdLooseDiMuonSameSign.DecayDescriptor = "[J/psi(1S) -> mu+ mu+]cc" StdLooseDiMuonSameSign.Inputs = ["Phys/StdAllLooseMuons/Particles"] +StdLooseDiMuonSameSign.CombinationCut="(ADOCACHI2CUT(30,''))" StdLooseDiMuonSameSign.MotherCut = "(VFASPF(VCHI2) < 25)" locations = updateDoD(StdLooseDiMuonSameSign) @@ -24,5 +25,5 @@ if '__main__' == __name__ : print __author__ print __version__ print locationsDoD ( locations ) - + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py index b9a4e9e87..086aec23c 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2MuMu.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseJpsi2MuMu.py,v 1.9 2009-06-29 09:16:49 gcowan Exp $ +# $Id: StdLooseJpsi2MuMu.py,v 1.9 2009-06-29 09:16:49 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdLooseJpsi2MuMu.py -# configuration file for 'Standard Loose Jpsi2MuMu' +# configuration file for 'Standard Loose Jpsi2MuMu' # @author Greig Cowan # @date 2009-06-23 # ============================================================================= @@ -19,18 +19,18 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLooseJpsi2MuMu = CombineParticles ("StdLooseJpsi2MuMu") StdLooseJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] -StdLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV)" +StdLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30,''))" StdLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLooseJpsi2MuMu ) ## ============================================================================ @@ -39,4 +39,4 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py index 2c79a6729..1d467a22b 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseJpsi2ee.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseJpsi2ee.py,v 1.6 2010-05-21 09:53:29 pkoppenb Exp $ +# $Id: StdLooseJpsi2ee.py,v 1.6 2010-05-21 09:53:29 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdLooseJpsi2ee.py -# configuration file for 'Standard Loose Jpsi2ee' +# configuration file for 'Standard Loose Jpsi2ee' # @author Patrick Koppenburg # @date 2009-02-18 # ============================================================================= @@ -23,15 +23,15 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLooseJpsi2ee = CombineParticles ( 'StdLooseJpsi2ee' ) StdLooseJpsi2ee.Inputs = [ "Phys/StdAllLooseElectrons/Particles" ] -StdLooseJpsi2ee.DecayDescriptor = "J/psi(1S) -> e+ e-" +StdLooseJpsi2ee.DecayDescriptor = "J/psi(1S) -> e+ e-" -StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV)" +StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV) & (ADOCACHI2CUT(30,''))" StdLooseJpsi2ee.MotherCut = "(VFASPF(VCHI2)<25)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLooseJpsi2ee ) ## ============================================================================ @@ -40,8 +40,8 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) # ============================================================================= -# The END +# The END # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py index 15cf569d4..ecb4ca545 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py @@ -31,7 +31,7 @@ StdLooseKsLL.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" StdLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)" } -StdLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV)" +StdLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(25, '')) " StdLooseKsLL.MotherCut = "(ADMASS('KS0') < 35.*MeV) & (VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service @@ -48,7 +48,7 @@ StdLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ] StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" StdLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)" } -StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV)" +StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV) & (ADOCACHI2CUT(25, ''))" StdLooseKsDD.MotherCut = "(ADMASS('KS0') < 64.*MeV) & (VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py index a6edd82ab..818343bfb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKstar.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseKstar.py,v 1.4 2009-06-28 12:02:54 gcowan Exp $ +# $Id: StdLooseKstar.py,v 1.4 2009-06-28 12:02:54 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdLooseKstar.py # configuration file for 'Standard Loose Kstar' -# (based on lifetime unbiased JpsiK* requirements) +# (based on lifetime unbiased JpsiK* requirements) # @author Greig Cowan # @date 2009-06-23 # ============================================================================= @@ -24,15 +24,15 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLooseKstar2Kpi = CombineParticles ("StdLooseKstar2Kpi") StdLooseKstar2Kpi.Inputs = ["Phys/StdAllLooseKaons/Particles", "Phys/StdAllLoosePions/Particles"] -StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" -StdLooseKstar2Kpi.CombinationCut = "(APT > 500.*MeV) & (ADAMASS('K*(892)0') < 300.*MeV)" +StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" +StdLooseKstar2Kpi.CombinationCut = "(APT > 500.*MeV) & (ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30, ''))" StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLooseKstar2Kpi ) ## ============================================================================ @@ -41,5 +41,5 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py index c07ff2254..f04466a97 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py @@ -36,7 +36,7 @@ StdLooseLambdaLL.DaughtersCuts = { "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)" } -StdLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV)" +StdLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(30, ''))" StdLooseLambdaLL.MotherCut = "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30)" ## configure Data-On-Demand service @@ -57,7 +57,7 @@ StdLooseLambdaDD.DaughtersCuts = { "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)" } -StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV)" +StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV) & (ADOCACHI2CUT(25, ''))" StdLooseLambdaDD.MotherCut = "(ADMASS('Lambda0')<64*MeV) & (VFASPF(VCHI2)<25)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py index 724369aaa..b40624c71 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py @@ -1,10 +1,10 @@ ##!/usr/bin/env python # ============================================================================= -# $Id: StdLoosePhi.py,v 1.6 2009-06-29 09:16:49 gcowan Exp $ +# $Id: StdLoosePhi.py,v 1.6 2009-06-29 09:16:49 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdLoosePhi2KK.py -# configuration file for 'Standard Loose ' -# @author Greig Cowan +# configuration file for 'Standard Loose ' +# @author Greig Cowan # @date 2009-06-23 # ============================================================================= """ @@ -23,14 +23,14 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLoosePhi2KK = CombineParticles("StdLoosePhi2KK") StdLoosePhi2KK.Inputs = ["Phys/StdAllLooseKaons/Particles"] -StdLoosePhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" -StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV)" +StdLoosePhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" +StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30, ''))" StdLoosePhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLoosePhi2KK ) ## ============================================================================ @@ -39,4 +39,4 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py index 9ade0f779..3452fa725 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseRho0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# $Id: StdLooseRho0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdLooseRho0.py -# configuration file for 'Standard Loose Rho0' +# configuration file for 'Standard Loose Rho0' # @author Patrick Koppenburg # @date 2009-02-18 # ============================================================================= @@ -23,15 +23,15 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) StdLooseRho0.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" -StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)" +StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)& (ADOCACHI2CUT(15, ''))" StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdLooseRho0 ) @@ -41,8 +41,8 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) # ============================================================================= -# The END +# The END # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 7760a940c..2de3c3172 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdMassConstrainedJpsi2MuMu.py,v 1.2 2010-09-05 20:36:44 gcowan Exp $ +# $Id: StdMassConstrainedJpsi2MuMu.py,v 1.2 2010-09-05 20:36:44 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdMassConstrainedJpsi2MuMu.py # configuration file for 'Standard mass constrained Jpsi2MuMu' @@ -25,12 +25,12 @@ from CommonParticles.Utils import * ## ============================================================================ StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] -StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : 'PIDmu > 0' } -StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV)" +StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & (ADOCACHI2CUT(20, ''))" StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdMassConstrainedJpsi2MuMu ) ## ============================================================================ @@ -39,4 +39,4 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py index f68eaa8bb..de3521ca6 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py @@ -24,7 +24,7 @@ StdVeryLooseDetachedKst2Kpi.DaughtersCuts = { "pi-":"(MIPCHI2DV(PRIMARY)>2.25)" } -StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV)" +StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV) & (ADOCACHI2CUT(30, ''))" StdVeryLooseDetachedKst2Kpi.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdVeryLooseDetachedKst2Kpi) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py index 5f77797a4..29d2eee66 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py @@ -7,7 +7,7 @@ __date__ = '07/07/2009' from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles from CommonParticles.Utils import * import GaudiKernel.SystemOfUnits as Units @@ -18,7 +18,7 @@ import GaudiKernel.SystemOfUnits as Units StdVeryLooseDiMuon = CombineParticles("StdVeryLooseDiMuon") StdVeryLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdVeryLooseDiMuon.Inputs = ["Phys/StdAllVeryLooseMuons/Particles"] -StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV)" +StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV) & (ADOCACHI2CUT(30, ''))" StdVeryLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25.)" locations = updateDoD(StdVeryLooseDiMuon) @@ -29,5 +29,5 @@ if '__main__' == __name__ : print __author__ print __version__ print locationsDoD ( locations ) - + diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py index ee5354ce9..a1d496cd1 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseJpsi2MuMu.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdVeryLooseJpsi2MuMu.py,v 1.1 2010-01-18 10:08:49 gcowan Exp $ +# $Id: StdVeryLooseJpsi2MuMu.py,v 1.1 2010-01-18 10:08:49 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdVeryLooseJpsi2MuMu.py -# configuration file for 'Standard Very Loose Jpsi2MuMu' +# configuration file for 'Standard Very Loose Jpsi2MuMu' # @author Greig Cowan # @date 2009-06-23 # ============================================================================= @@ -19,18 +19,18 @@ __all__ = ( ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm StdVeryLooseJpsi2MuMu = CombineParticles ("StdVeryLooseJpsi2MuMu") StdVeryLooseJpsi2MuMu.Inputs = ["Phys/StdVeryLooseMuons/Particles"] -StdVeryLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV)" +StdVeryLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" +StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30, ''))" StdVeryLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)" -## configure Data-On-Demand service +## configure Data-On-Demand service locations = updateDoD ( StdVeryLooseJpsi2MuMu ) ## ============================================================================ @@ -39,4 +39,4 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locationsDoD ( locations ) -- GitLab From bc33302302581e0cd5b4ee8b3ad25416c7a16280 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:03:01 +0100 Subject: [PATCH 09/50] v3r0 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 21 ++++++ .../NoBremNoPIDsDownElectrons.py | 51 ++++++++++++++ .../CommonParticles/NoBremNoPIDsElectrons.py | 53 +++++++++++++++ .../NoBremNoPIDsTtrackElectrons.py | 51 ++++++++++++++ .../NoBremNoPIDsUpElectrons.py | 52 ++++++++++++++ .../NoBremNoPIDsVeloElectrons.py | 49 ++++++++++++++ .../python/CommonParticles/StandardDplus.py | 5 ++ .../python/CommonParticles/StandardV0.py | 3 + .../CommonParticles/StdLooseDiElectron.py | 1 + .../python/CommonParticles/StdLooseDplus.py | 47 +++++++++++++ .../StdMassConstrainedJpsi2MuMu.py | 2 +- .../python/CommonParticles/StdTightDplus.py | 41 ++++++++++++ .../python/CommonParticles/StdVeryLooseKs.py | 67 +++++++++++++++++++ 15 files changed, 444 insertions(+), 3 deletions(-) create mode 100755 Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsVeloElectrons.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdTightDplus.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index cbf19f20b..4f914a019 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r4 +version v8r5 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 75ce650ad..fd67cc84c 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r4 +v8r5 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 007794b04..f2f318626 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,27 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r5 2011-09-15 ========================= +! 2011-09-14 - Ulrichh Kerzel +- Add NoBremNoPIDs*Electrons for all types: Track as electron, no PID requirement, no Bremsstrahlung correction + +! 2011-08-27 - Susan Haines + - Added StdVeryLooseKs.py, LL and DD Kshorts. LL using StdAllNoPIDsPions for daughters (no default pT cut). Added for use in StrippingBu2D0h_D02KShh_NoPID and WS lines. + - Added StdVeryLooseKs to StandardV0.py + +! 2011-08-26 Carla Gobel & Sandra Amato + - Added StdTightDplus.py to be used in KKPos stripping line and included in StandardDplus.py + +! 2011-08-25 - Greig Cowan + - Added muon PT > 0.5*GeV cut to StdMassConstrainedJpsi + +! 2011-08-19 - Jibo He + - StdLooseDiElectron + . Added PT>500 MeV for electron to speed up. + +!2011-08-19 Hamish Gordon + - Add CommonParticles for D(s)->KKK and Ds->K+K+pi-, with Oxford/Rio stripping selection to keep the timing down + !========================= CommonParticles v8r4 2011-08-04 ========================= ! 2011-08-03 - Rob Lambert - Add in ADOCACHI2 to all two body decays, add EOL native everywhere diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py new file mode 100755 index 000000000..22735be7b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'NoBrem NoPIDs Electrons with downstram tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'NoBremNoPIDsDownElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsDownElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +algorithm.AddBremPhotonTo = [] + +# configure the track selector +selector = trackSelector ( algorithm , trackTypes = [ "Downstream" ]) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +NoBremNoPIDsDownElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py new file mode 100755 index 000000000..6b1dc4d9d --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsElectrons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Electrons' +# @author Patrick Koppenburg +# @date 2011-07-18 +# ============================================================================= +""" +Configuration file for 'No Brem NoPIDs Electrons wioth loose cuts' +""" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'NoBremNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsElectrons' , + DecayDescriptor = 'Electron' , + Particle = 'electron' ) + +selector = trackSelector ( algorithm , trackTypes = [ "Long" ]) + +algorithm.AddBremPhotonTo = [] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +NoBremNoPIDsElectrons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py new file mode 100755 index 000000000..93ef9df64 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsVeloElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'NoBrem NoPIDs Electrons with Ttrack tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'NoBremNoPIDsTtrackElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsTtrackElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +algorithm.AddBremPhotonTo = [] + +# configure the track selector +selector = trackSelector ( algorithm,trackTypes = [ "Ttrack" ] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +NoBremNoPIDsTtrackElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py new file mode 100755 index 000000000..4e7bb732c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsUpElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'NoBrem NoPIDs Electrons with Upstream tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'NoBremNoPIDsUpElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsUpElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + + +algorithm.AddBremPhotonTo = [] + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = [ "Upstream" ] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +NoBremNoPIDsUpElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsVeloElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsVeloElectrons.py new file mode 100755 index 000000000..5d7e708ef --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsVeloElectrons.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsVeloElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Electrons with VELO tracks' +""" +__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsVeloElectrons' , + DecayDescriptor = 'Electron' , Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm,trackTypes = [ "Velo" ] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsVeloElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDplus.py b/Phys/CommonParticles/python/CommonParticles/StandardDplus.py index 3dcec684f..7c5b3a1c3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardDplus.py @@ -19,6 +19,11 @@ _locations = {} from CommonParticles.StdLooseDplus import * _locations.update ( locations ) + +from CommonParticles.StdTightDplus import * +_locations.update ( locations ) + + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardV0.py b/Phys/CommonParticles/python/CommonParticles/StandardV0.py index db335e192..1daa69c99 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardV0.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardV0.py @@ -22,6 +22,9 @@ _locations.update ( locations ) from CommonParticles.StdLooseLambda import * _locations.update ( locations ) +from CommonParticles.StdVeryLooseKs import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index bab85b275..4f064947f 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -18,6 +18,7 @@ import GaudiKernel.SystemOfUnits as Units StdLooseDiElectron = CombineParticles("StdLooseDiElectron") StdLooseDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] +StdLooseDiElectron.DaughtersCuts = { "e+" : "(PT>500*MeV)" } StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30,''))" StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDiElectron) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py index 34f388946..35eaaaf45 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py @@ -20,6 +20,8 @@ __all__ = ( 'StdLooseDplus2KPiPiOppSignPi' , 'StdLooseDsplus2KKPi' , 'StdLooseDplus2hhh', + 'StdLooseDplus2KKK', + 'StdLooseDsplus2KKPiOppSign', 'locations' ) # ============================================================================= @@ -74,6 +76,51 @@ StdLooseDplus2KPiPiOppSignPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KPiPiOpp StdLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" locations = updateDoD ( StdLooseDplus2KPiPiOppSignPi ) +######################################################################################## + +StdLooseDplus2KKK = CombineParticles ( 'StdLooseDplus2KKK' ) + +StdLooseDplus2KKK.Inputs = [ "Phys/StdLooseKaons/Particles" ] +StdLooseDplus2KKK.DecayDescriptor = "[D+ -> K- K+ K+]cc" +StdLooseDplus2KKK.DaughtersCuts = { + "K+" : "(PT > 250*MeV) & (P > 2000*MeV) &((MIPCHI2DV(PRIMARY)) > 2.0 ) & (PIDK-PIDpi > 3.0)" + } + +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds + +StdLooseDplus2KKK.CombinationCut = "(AM>1760.*MeV) & (AM<2080.*MeV) & (ACHILD(PT,1)+ACHILD(PT,2)+ACHILD(PT,3) > 2500*MeV) & (ADOCACHI2CUT(50 , '' )) & (ANUM(MIPCHI2DV(PRIMARY) > 4.0 ) >= 2) & (AHASCHILD(MIPCHI2DV(PRIMARY) > 10.0)) & (ADOCAMAX('') < 0.5*mm)" +StdLooseDplus2KKK.MotherCut = "(PT > 1000) & (VFASPF(VCHI2/VDOF) < 10.0) & (BPVDIRA > 0.98) & (BPVIPCHI2() < 15.0) & (VFASPF(VMINVDCHI2DV(PRIMARY)) > 100.0)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDplus2KKK ) + + + + +######################################################################################## +StdLooseDsplus2KKPiOppSign = CombineParticles ( 'StdLooseDsplus2KKPiOppSign' ) + +StdLooseDsplus2KKPiOppSign.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles" ] +StdLooseDsplus2KKPiOppSign.DecayDescriptor = "[D_s+ -> pi- K+ K+]cc" +StdLooseDsplus2KKPiOppSign.DaughtersCuts = { + "K+" : "(PT > 250*MeV) & (P > 2000*MeV) &((MIPCHI2DV(PRIMARY)) > 2.5 ) & (PIDK-PIDpi > 3.0)", + "pi+" : "(PT > 250*MeV) & (P > 2000*MeV) &((MIPCHI2DV(PRIMARY)) > 2.5 ) & (PIDK-PIDpi < 10.0)" + } + +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds + +StdLooseDsplus2KKPiOppSign.CombinationCut = "(AM>1760.*MeV) & (AM<2080.*MeV) & (ACHILD(PT,1)+ACHILD(PT,2)+ACHILD(PT,3) > 2500*MeV) & (ADOCACHI2CUT(50 , '' )) & (ANUM(MIPCHI2DV(PRIMARY) > 4.0 ) >= 2) & (AHASCHILD(MIPCHI2DV(PRIMARY) > 10.0)) & (ADOCAMAX('') < 0.5*mm)" +StdLooseDsplus2KKPiOppSign.MotherCut = "(PT > 1000) & (VFASPF(VCHI2/VDOF) < 10.0) & (BPVDIRA > 0.98) & (BPVIPCHI2() < 15.0) & (VFASPF(VMINVDCHI2DV(PRIMARY)) > 100.0)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDsplus2KKPiOppSign ) +########################################################################################## + + + StdLooseDplus2hhh = CombineParticles ( 'StdLooseDplus2hhh') StdLooseDplus2hhh.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseDplus2hhh.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 2de3c3172..92e312d26 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -26,7 +26,7 @@ from CommonParticles.Utils import * StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" -StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : 'PIDmu > 0' } +StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : '(PIDmu > 0) & (PT > 0.5*GeV)' } StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & (ADOCACHI2CUT(20, ''))" StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py b/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py new file mode 100644 index 000000000..8f47c690c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +## @file CommonParticles/StdTightDplus.py +# configuration file for 'Standard Tight Dplus' +# @author Sandra Amato +# @date 2011-08-26# ============================================================================= +""" +Configuration file for 'Standard Tight Dplus'""" +__author__ = "Sandra Amato" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.8 $" +# ============================================================================= +__all__ = ( 'StdTightDplus2KPiPiOppSignPi' ,'locations') +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +## ============================================================================ +StdTightDplus2KPiPiOppSignPi = CombineParticles ( 'StdTightDplus2KPiPiOppSignPi') +StdTightDplus2KPiPiOppSignPi.Inputs = [ "Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles" ] + +StdTightDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" +StdTightDplus2KPiPiOppSignPi.DaughtersCuts = { + "K+" : "(P > 2*GeV) & ((PIDK-PIDpi) > 7.)", + "pi+" : "(P > 2*GeV) & ((PIDK-PIDpi) < 3.)" + } +StdTightDplus2KPiPiOppSignPi.CombinationCut = "((AM>1760.*MeV) & (AM<2080.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))" +StdTightDplus2KPiPiOppSignPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1770.*MeV) & (M < 2070.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" + +locations = updateDoD ( StdTightDplus2KPiPiOppSignPi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py new file mode 100644 index 000000000..2107d3593 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdVeryLooseKs.py,v 1.5 2009-05-26 13:48:13 shaines Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseVeryKs.py +# configuration file for 'Standard Very Loose ' +# @author Susan Haines +# @date 2011-08-27 +# ============================================================================= +""" +Configuration file for 'Standard Very Loose Ks' using StdAllNoPIDsPions, i.e. no pT cut on LL pi daughters. Other cuts tighter vs. StdLooseKs. +""" +__author__ = "Susan Haines" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseKsLL' , + 'StdVeryLooseKsDD' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseKsLL = CombineParticles ( 'StdVeryLooseKsLL' ) + +StdVeryLooseKsLL.Inputs = [ "Phys/StdAllNoPIDsPions/Particles" ] +StdVeryLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" + +StdVeryLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (P < 100.*GeV) & (BPVIPCHI2() > 9.)" } +StdVeryLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 35.*MeV) & (AMINDOCA('LoKi::TrgDistanceCalculator')<1.5)" +StdVeryLooseKsLL.MotherCut = "(ADMASS('KS0') < 20.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.) " + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseKsLL ) + +## ============================================================================ +# configuration file for 'Standard Very Loose Downstream ' +# @author Susan Haines +# @date 2011-08-27 +# ============================================================================= +StdVeryLooseKsDD = CombineParticles ( 'StdVeryLooseKsDD' ) + +StdVeryLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ] +StdVeryLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" + +StdVeryLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (P < 100.*GeV) & (BPVIPCHI2() > 6.25) & ((-PIDK) > 0.)" } +StdVeryLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (AMINDOCA('LoKi::TrgDistanceCalculator')<22.)" +StdVeryLooseKsDD.MotherCut = "(ADMASS('KS0') < 28.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.)" + +## configure Data-On-Demand service +locations.update( updateDoD ( StdVeryLooseKsDD )) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From da1ad87b2992a5aec0528396c93c628473c7a489 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:03:53 +0100 Subject: [PATCH 10/50] v4r0 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 52 +++++++++++++++-- .../NoBremNoPIDsDownElectrons.py | 6 +- .../CommonParticles/NoBremNoPIDsElectrons.py | 2 - .../NoBremNoPIDsTtrackElectrons.py | 5 +- .../NoBremNoPIDsUpElectrons.py | 8 +-- .../CommonParticles/StandardDiElectron.py | 3 + .../CommonParticles/StandardElectrons.py | 20 +++++++ .../python/CommonParticles/StandardEta.py | 1 - .../python/CommonParticles/StandardKaons.py | 20 +++++++ .../python/CommonParticles/StandardKstar.py | 5 ++ .../python/CommonParticles/StandardMuons.py | 9 +++ .../python/CommonParticles/StandardPhi.py | 2 + .../python/CommonParticles/StandardPions.py | 20 +++++++ .../python/CommonParticles/StandardProtons.py | 20 +++++++ .../python/CommonParticles/StandardV0.py | 3 + .../StdAllLooseANNElectrons.py | 53 +++++++++++++++++ .../CommonParticles/StdAllLooseANNKaons.py | 51 +++++++++++++++++ .../CommonParticles/StdAllLooseANNPions.py | 53 +++++++++++++++++ .../CommonParticles/StdAllLooseANNProtons.py | 52 +++++++++++++++++ .../CommonParticles/StdAllLooseElectrons.py | 13 +---- .../CommonParticles/StdAllLooseKaons.py | 3 - .../CommonParticles/StdAllLooseMuons.py | 2 - .../CommonParticles/StdAllLoosePions.py | 6 +- .../CommonParticles/StdAllLooseProtons.py | 8 +-- .../CommonParticles/StdAllNoPIDsElectrons.py | 6 +- .../CommonParticles/StdAllNoPIDsKaons.py | 1 - .../CommonParticles/StdAllNoPIDsMuons.py | 1 - .../CommonParticles/StdAllNoPIDsPions.py | 1 - .../CommonParticles/StdAllNoPIDsProtons.py | 1 - .../CommonParticles/StdAllVeryLooseMuons.py | 4 +- .../StdLooseANNDownElectrons.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNDownKaons.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNDownPions.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNDownProtons.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNElectrons.py | 44 ++++++++++++++ .../CommonParticles/StdLooseANNKaons.py | 44 ++++++++++++++ .../CommonParticles/StdLooseANNPions.py | 44 ++++++++++++++ .../CommonParticles/StdLooseANNProtons.py | 44 ++++++++++++++ .../CommonParticles/StdLooseANNUpElectrons.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNUpKaons.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNUpPions.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseANNUpProtons.py | 54 ++++++++++++++++++ .../CommonParticles/StdLooseAllPhotons.py | 5 +- .../CommonParticles/StdLooseCnvPhotons.py | 2 +- .../StdLooseDetachedDiElectron.py | 33 +++++++++++ .../CommonParticles/StdLooseDetachedKpi.py | 28 +++++++++ .../CommonParticles/StdLooseDownKaons.py | 4 +- .../CommonParticles/StdLooseElectrons.py | 13 ++--- .../python/CommonParticles/StdLooseKaons.py | 13 ++--- .../python/CommonParticles/StdLooseKs.py | 35 +++++++++++- .../CommonParticles/StdLooseMergedPi0.py | 3 - .../python/CommonParticles/StdLooseMuons.py | 2 - .../python/CommonParticles/StdLoosePhi.py | 2 +- .../python/CommonParticles/StdLoosePhotons.py | 5 +- .../python/CommonParticles/StdLoosePions.py | 9 +-- .../python/CommonParticles/StdLooseProtons.py | 9 +-- .../CommonParticles/StdLooseResolvedEta.py | 2 +- .../CommonParticles/StdLooseResolvedPi0.py | 2 +- .../CommonParticles/StdNoPIDsDownElectrons.py | 5 +- .../CommonParticles/StdNoPIDsDownPions.py | 6 +- .../CommonParticles/StdNoPIDsDownProtons.py | 4 +- .../CommonParticles/StdNoPIDsElectrons.py | 2 +- .../python/CommonParticles/StdNoPIDsKaons.py | 2 +- .../python/CommonParticles/StdNoPIDsMuons.py | 2 +- .../python/CommonParticles/StdNoPIDsPions.py | 2 +- .../StdTightANNDownElectrons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNDownKaons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNDownMuons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNDownPions.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNDownProtons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNElectrons.py | 55 ++++++++++++++++++ .../CommonParticles/StdTightANNKaons.py | 52 +++++++++++++++++ .../CommonParticles/StdTightANNMuons.py | 55 ++++++++++++++++++ .../CommonParticles/StdTightANNPions.py | 52 +++++++++++++++++ .../CommonParticles/StdTightANNProtons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNUpElectrons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNUpKaons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNUpMuons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNUpPions.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightANNUpProtons.py | 54 ++++++++++++++++++ .../CommonParticles/StdTightElectrons.py | 2 - .../python/CommonParticles/StdTightKaons.py | 5 -- .../python/CommonParticles/StdTightMuons.py | 5 +- .../python/CommonParticles/StdTightPhi.py | 36 ++++++++++++ .../python/CommonParticles/StdTightPions.py | 6 +- .../python/CommonParticles/StdTightProtons.py | 7 +-- .../StdVeryLooseDetachedKstar.py | 10 ++-- .../CommonParticles/StdVeryLooseDiMuon.py | 2 +- .../python/CommonParticles/StdVeryLooseKs.py | 6 +- .../CommonParticles/StdVeryLooseLambda.py | 57 +++++++++++++++++++ .../CommonParticles/StdVeryLooseMuons.py | 4 +- 93 files changed, 2034 insertions(+), 147 deletions(-) create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKpi.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNDownMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNUpMuons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightPhi.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambda.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 4f914a019..1a2319c19 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r5 +version v8r6 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index fd67cc84c..fa6c31c45 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r5 +v8r6 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index f2f318626..b50a19c29 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,16 +8,54 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r6 2012-02-10 ========================= +! 2012-02-03 - Jibo He + - Added StdTightPhi, using StdTightKaons. + +! 2012-02-01 - Jibo He + - StdDetachedKstar + Renamed as StdLooseDetachedKpi, to better reflect what's inside. + +! 2012-01-31 - Jibo He + - StdVeryLooseDetachedKstar + Commented out daughters cuts to save a little bit CPU, + because tighter cuts IPCHI2>4 already applied on StdLoose{Kaons,Pions} + - StdDetachedKstar + New KSTAR particle with mass up to 2.2 GeV. + +! 2012-01-31 - Jibo He + - Added StdLooseDetachedDiElectron, with cuts of PT>200 MeV, IPS>1 on both electrons, + and M(ee)>20 MeV. + +! 2012-01-27 - Chris Jones + - Add new Standard Particles using cuts the ANN PID variables. + The cuts have been tuned to give, more or less, the same efficiency (on MC11) + as their Combined DLL counterparts, but with better mis-ID rates ! + - Various minor fixes to typos in comments here and there. + +! 2012-01-27 - Patrick Koppenburg + - Added LD Ks for studies + +! 2012-01-20 - Thomas Blake + - Added StdVeryLooseLambda using AllNoPIDs particles + +! 2012-01-19 - Susan Haines +- Updated (looser) StdVeryLooseKs.py Kshort mass windows, both LL and DD. + !========================= CommonParticles v8r5 2011-09-15 ========================= -! 2011-09-14 - Ulrichh Kerzel -- Add NoBremNoPIDs*Electrons for all types: Track as electron, no PID requirement, no Bremsstrahlung correction +! 2011-09-14 - Ulrich Kerzel +- Add NoBremNoPIDs*Electrons for all types: Track as electron, no PID requirement, + no Bremsstrahlung correction ! 2011-08-27 - Susan Haines - - Added StdVeryLooseKs.py, LL and DD Kshorts. LL using StdAllNoPIDsPions for daughters (no default pT cut). Added for use in StrippingBu2D0h_D02KShh_NoPID and WS lines. + - Added StdVeryLooseKs.py, LL and DD Kshorts. LL using StdAllNoPIDsPions for + daughters (no default pT cut). Added for use in StrippingBu2D0h_D02KShh_NoPID + and WS lines. - Added StdVeryLooseKs to StandardV0.py ! 2011-08-26 Carla Gobel & Sandra Amato - - Added StdTightDplus.py to be used in KKPos stripping line and included in StandardDplus.py + - Added StdTightDplus.py to be used in KKPos stripping line and included in + StandardDplus.py ! 2011-08-25 - Greig Cowan - Added muon PT > 0.5*GeV cut to StdMassConstrainedJpsi @@ -27,14 +65,16 @@ . Added PT>500 MeV for electron to speed up. !2011-08-19 Hamish Gordon - - Add CommonParticles for D(s)->KKK and Ds->K+K+pi-, with Oxford/Rio stripping selection to keep the timing down + - Add CommonParticles for D(s)->KKK and Ds->K+K+pi-, with Oxford/Rio stripping + selection to keep the timing down !========================= CommonParticles v8r4 2011-08-04 ========================= ! 2011-08-03 - Rob Lambert - Add in ADOCACHI2 to all two body decays, add EOL native everywhere ! 2011-08-03 - Rob Lambert - - Rolf added back in the ADOCACHI2 cuts to Ks and lambda, it improves the timing by a lot. + - Rolf added back in the ADOCACHI2 cuts to Ks and lambda, it improves the timing + by a lot. !========================= CommonParticles v8r3 2011-07-22 ========================= ! 2011-07-21 - Patrick Koppenburg diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py index 22735be7b..ee8a2fa2a 100755 --- a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py @@ -20,12 +20,12 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsDownElectrons' , - DecayDescriptor = 'Electron' , Particle = 'electron' ) +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsDownElectrons' , + DecayDescriptor = 'Electron' , + Particle = 'electron' ) algorithm.AddBremPhotonTo = [] diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py index 6b1dc4d9d..4846d39b4 100755 --- a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py @@ -20,8 +20,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py index 93ef9df64..957442606 100755 --- a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py @@ -24,8 +24,9 @@ from Configurables import NoPIDsParticleMaker from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsTtrackElectrons' , - DecayDescriptor = 'Electron' , Particle = 'electron' ) +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsTtrackElectrons', + DecayDescriptor = 'Electron' , + Particle = 'electron' ) algorithm.AddBremPhotonTo = [] diff --git a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py index 4e7bb732c..837a64b5a 100755 --- a/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py @@ -20,14 +20,12 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsUpElectrons' , - DecayDescriptor = 'Electron' , Particle = 'electron' ) - - +algorithm = NoPIDsParticleMaker ( 'NoBremNoPIDsUpElectrons' , + DecayDescriptor = 'Electron' , + Particle = 'electron' ) algorithm.AddBremPhotonTo = [] # configure the track selector diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py index 894707d8c..5e2960b9b 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py @@ -23,6 +23,9 @@ _locations = {} from CommonParticles.StdLooseDiElectron import * _locations.update ( locations ) +from CommonParticles.StdLooseDetachedDiElectron import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py index dedbcaad9..2e0fbf269 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py @@ -28,9 +28,29 @@ _locations.update ( locations ) from CommonParticles.StdLooseElectrons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseANNElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNElectrons import * +_locations.update ( locations ) + from CommonParticles.StdTightElectrons import * _locations.update ( locations ) +from CommonParticles.StdTightANNElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNDownElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNDownElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNUpElectrons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNUpElectrons import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardEta.py b/Phys/CommonParticles/python/CommonParticles/StandardEta.py index b3cb6e8e0..dddf11b5a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardEta.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardEta.py @@ -19,7 +19,6 @@ _locations = {} from CommonParticles.StdLooseResolvedEta import * _locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py index c49706e03..054843512 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py @@ -25,15 +25,35 @@ _locations.update ( locations ) from CommonParticles.StdAllLooseKaons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseANNKaons import * +_locations.update ( locations ) + from CommonParticles.StdLooseKaons import * _locations.update ( locations ) +from CommonParticles.StdLooseANNKaons import * +_locations.update ( locations ) + from CommonParticles.StdLooseDownKaons import * _locations.update ( locations ) from CommonParticles.StdTightKaons import * _locations.update ( locations ) +from CommonParticles.StdTightANNKaons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNDownKaons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNDownKaons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNUpKaons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNUpKaons import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKstar.py b/Phys/CommonParticles/python/CommonParticles/StandardKstar.py index f9093c0fd..aaa9f0823 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardKstar.py @@ -18,11 +18,16 @@ _locations = {} from CommonParticles.StdLooseKstar import * _locations.update ( locations ) + from CommonParticles.StdVeryLooseDetachedKstar import * _locations.update ( locations ) + from CommonParticles.StdLooseDetachedKstar import * _locations.update ( locations ) +from CommonParticles.StdLooseDetachedKpi import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py index edf55da8b..b2c7fad7a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py @@ -37,6 +37,15 @@ _locations.update ( locations ) from CommonParticles.StdTightMuons import * _locations.update ( locations ) +from CommonParticles.StdTightANNMuons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNDownMuons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNUpMuons import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPhi.py b/Phys/CommonParticles/python/CommonParticles/StandardPhi.py index 1da2d72fa..5cdd9d05e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardPhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardPhi.py @@ -20,6 +20,8 @@ from CommonParticles.StdLoosePhi import * _locations.update ( locations ) from CommonParticles.StdLooseDetachedPhi import * _locations.update ( locations ) +from CommonParticles.StdTightPhi import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPions.py b/Phys/CommonParticles/python/CommonParticles/StandardPions.py index 2fb9ae585..f36008eb9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardPions.py @@ -37,6 +37,26 @@ _locations.update ( locations ) from CommonParticles.StdTightPions import * _locations.update ( locations ) +from CommonParticles.StdAllLooseANNPions import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNPions import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNPions import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNDownPions import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNDownPions import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNUpPions import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNUpPions import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardProtons.py b/Phys/CommonParticles/python/CommonParticles/StandardProtons.py index 9c63448fc..12aea6374 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardProtons.py @@ -28,12 +28,32 @@ _locations.update ( locations ) from CommonParticles.StdAllLooseProtons import * _locations.update ( locations ) +from CommonParticles.StdAllLooseANNProtons import * +_locations.update ( locations ) + from CommonParticles.StdLooseProtons import * _locations.update ( locations ) +from CommonParticles.StdLooseANNProtons import * +_locations.update ( locations ) + from CommonParticles.StdTightProtons import * _locations.update ( locations ) +from CommonParticles.StdTightANNProtons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNDownProtons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNDownProtons import * +_locations.update ( locations ) + +from CommonParticles.StdLooseANNUpProtons import * +_locations.update ( locations ) + +from CommonParticles.StdTightANNUpProtons import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardV0.py b/Phys/CommonParticles/python/CommonParticles/StandardV0.py index 1daa69c99..14c524c79 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardV0.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardV0.py @@ -25,6 +25,9 @@ _locations.update ( locations ) from CommonParticles.StdVeryLooseKs import * _locations.update ( locations ) +from CommonParticles.StdVeryLooseLambda import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py new file mode 100755 index 000000000..a8d9a6972 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdAllLooseANNElectrons.py +# configuration file for 'Standard Loose ANN Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Electrons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseANNElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLooseANNElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +#fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.09'" ] +#fltr.Selection = [ "ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.25'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseANNElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py new file mode 100755 index 000000000..eb6dd4b94 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNKaons.py +# configuration file for 'Standard Loose ANN Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose ANN Kaons' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseANNKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker( 'StdAllLooseANNKaons', + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] +fltr.Selection = [ "ProbNNk>'0.025'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseANNKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py new file mode 100755 index 000000000..8d3320a89 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdAllLooseANNPions.py +# configuration file for 'Standard AllLoose Pions' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard All Loose ANN Pions' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseANNPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLooseANNPions', + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseANNPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py new file mode 100755 index 000000000..39aa8850e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdALLLooseANNProtons.py +# configuration file for 'Standard Loose Protons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose ANN Protons' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseANNProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdAllLooseANNProtons', + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.05'" ] +fltr.Selection = [ "ProbNNp>'0.0125'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdAllLooseANNProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py index f1b9a621f..1373b7eca 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py @@ -14,20 +14,18 @@ __author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= __all__ = ( - 'StdAllLooseElectrons' , + 'StdAllLooseElectrons', 'locations' ) # ============================================================================= from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleCALOFilter -from Configurables import BremAdder - from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdAllLooseElectrons' , - Particle = 'electron' ) +algorithm = CombinedParticleMaker ( 'StdAllLooseElectrons' , + Particle = 'electron' ) # configure the track selector selector = trackSelector ( algorithm ) @@ -42,11 +40,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdAllLooseElectrons = algorithm -## temporary: -#algorithm.addTool ( BremAdder ) -#brem = algorithm.BremAdder -#brem.BremCor = 1.0 - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py index 6685cd28d..8fc0c2a3c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseKaons.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdLooseKaons.py # configuration file for 'Standard Loose Kaons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl @@ -20,7 +18,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py index 87c97f4a3..d7377a5e6 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseMuons.py @@ -21,8 +21,6 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleMUONFilter - - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py b/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py index 460151907..1fb698684 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLoosePions.py @@ -21,13 +21,11 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleCALOFilter - - from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdAllLoosePions' , - Particle = 'pion' ) +algorithm = CombinedParticleMaker ( 'StdAllLoosePions' , + Particle = 'pion' ) # configure the track selector selector = trackSelector ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py index 8e2383e8f..7c0413d0d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseProtons.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdLooseProtons.py # configuration file for 'Standard Loose Protons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl @@ -21,13 +19,11 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleCALOFilter - - from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdAllLooseProtons', - Particle = 'proton' ) +algorithm = CombinedParticleMaker ( 'StdAllLooseProtons', + Particle = 'proton' ) # configure the track selector selector = trackSelector ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py index d77f3bbda..131799d15 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsElectrons.py @@ -20,12 +20,12 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsElectrons' , - DecayDescriptor = 'Electron' , Particle = 'electron' ) +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsElectrons' , + DecayDescriptor = 'Electron' , + Particle = 'electron' ) # configure the track selector selector = trackSelector ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py index 5de7913f1..55ca258d0 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsKaons.py @@ -20,7 +20,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py index 09bd416cf..5af2ea975 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsMuons.py @@ -20,7 +20,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py index b4f17c057..b07c74ab1 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsPions.py @@ -20,7 +20,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py index 92226d645..86288755a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsProtons.py @@ -20,7 +20,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import NoPIDsParticleMaker - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py index 7489aa21b..e0e451bd5 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllVeryLooseMuons.py @@ -3,7 +3,7 @@ # $Id: StdVeryLooseMuons.py,v 1.1 2009-10-08 12:37:06 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdAllVeryLooseMuons.py -# configuration file for 'Standard AllVery Loose Muons' +# configuration file for 'Standard All Very Loose Muons' # @author Patrick Koppenburg patrick.koppenburg@cern.ch # @date 2009-10-08 # ============================================================================= @@ -21,8 +21,6 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleMUONFilter - - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py new file mode 100755 index 000000000..3b31aaf64 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNDownElectrons.py +# configuration file for 'Standard Loose ANN Downstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Downstream Electrons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNDownElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNDownElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +#fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNDownElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py new file mode 100755 index 000000000..f01cdf744 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNDownKaons.py +# configuration file for 'Standard Loose ANN Downstream Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Downstream Kaons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNDownKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNDownKaons' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] +fltr.Selection = [ "ProbNNk>'0.075'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNDownKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py new file mode 100755 index 000000000..e2aa519bf --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNDownPions.py +# configuration file for 'Standard Loose ANN Downstream Pions' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Downstream Pions using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNDownPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNDownPions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNDownPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py new file mode 100755 index 000000000..42a765359 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNDownProtons.py +# configuration file for 'Standard Loose ANN Downstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Downstream Protons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNDownProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNDownProtons' , + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNDownProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNElectrons.py new file mode 100755 index 000000000..26cdaf639 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNElectrons.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNElectrons.py +# configuration file for 'Standard Loose ANN PID Electrons' +# @author Patrick Koppenburg +# @date 2011-07-18 +# ============================================================================= +""" +Configuration file for 'Standard Loose Electrons using ANN PID' +""" +__author__ = "Patrick Koppenburg " +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * + +## create the algorithm +algorithm = FilterDesktop( 'StdLooseANNElectrons', + Inputs = ["Phys/StdAllLooseANNElectrons/Particles"], + Code = defaultCuts() ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNKaons.py new file mode 100755 index 000000000..752687c2b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNKaons.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNKaons.py +# configuration file for 'Standard Loose Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Kaons with loose ANN cuts' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * + +## create the algorithm +algorithm = FilterDesktop( 'StdLooseANNKaons', + Inputs = ["Phys/StdAllLooseANNKaons/Particles"], + Code = defaultCuts() ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNPions.py new file mode 100755 index 000000000..820046cbd --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNPions.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNPions.py +# configuration file for 'Standard Loose Pions' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose ANN Pions' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * + +## create the algorithm +algorithm = FilterDesktop ( 'StdLooseANNPions', + Inputs = ["Phys/StdAllLooseANNPions/Particles"], + Code = defaultCuts() ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNProtons.py new file mode 100755 index 000000000..e93f04d9b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNProtons.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNProtons.py +# configuration file for 'Standard Loose Protons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Protons with loose ANN cuts' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import FilterDesktop +from CommonParticles.Utils import * + +## create the algorithm +algorithm = FilterDesktop( 'StdLooseANNProtons', + Inputs = ["Phys/StdAllLooseANNProtons/Particles"], + Code = defaultCuts() ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py new file mode 100755 index 000000000..f8217582c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNUpElectrons.py +# configuration file for 'Standard Loose ANN Upstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Upstream Electrons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNUpElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNUpElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNUpElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py new file mode 100755 index 000000000..9d4cc93e3 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNUpKaons.py +# configuration file for 'Standard Loose ANN Upstream Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Upstream Kaons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNUpKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNUpKaons' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.1'" ] +fltr.Selection = [ "ProbNNk>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNUpKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py new file mode 100755 index 000000000..9c3e5fb58 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNUpPions.py +# configuration file for 'Standard Loose ANN Upstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Upstream Pions using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNUpPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNUpPions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNUpPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py new file mode 100755 index 000000000..8c2bb3950 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdLooseANNUpProtons.py +# configuration file for 'Standard Loose ANN Upstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Upstream Protons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdLooseANNUpProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseANNUpProtons' , + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseANNUpProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py index 7ad84adfc..6e9bc62db 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseAllPhotons.py @@ -3,7 +3,7 @@ # $Id: StdLooseAllPhotons.py,v 1.2 2009-04-22 14:17:39 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdLooseAllPhotons.py -# configuration file for 'Standard Loose Pions' +# configuration file for 'Standard Loose All Photons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl # @date 2009-01-14 # ============================================================================= @@ -21,12 +21,9 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import PhotonMakerAlg from Configurables import PhotonMaker - from GaudiKernel.SystemOfUnits import MeV - from CommonParticles.Utils import * - ## create the algorithm algorithm = PhotonMakerAlg ( 'StdLooseAllPhotons' , DecayDescriptor = 'Gamma' ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py index e68416089..ad0c50a64 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseCnvPhotons.py @@ -27,7 +27,7 @@ from GaudiKernel.SystemOfUnits import MeV from CommonParticles.Utils import * ## create the algorithm -algorithm = PhotonMakerAlg ( 'StdLooseCnvPhotons' , +algorithm = PhotonMakerAlg ( 'StdLooseCnvPhotons', DecayDescriptor = 'Gamma' ) # configure desktop&particle maker: diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py new file mode 100644 index 000000000..a621a2783 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py @@ -0,0 +1,33 @@ +""" +Configuration file for Standard Loose Detached DiElectron +""" + +__author__ = 'Jibo He' +__date__ = '20/01/2012' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +############################## +# StdLooseDetachedDiElectron # +############################## +StdLooseDetachedDiElectron = CombineParticles("StdLooseDetachedDiElectron") +StdLooseDetachedDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" +StdLooseDetachedDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] +StdLooseDetachedDiElectron.DaughtersCuts = { "e+" : "(PT>200*MeV) & (MIPCHI2DV(PRIMARY)>1.)" } +StdLooseDetachedDiElectron.CombinationCut = "(ADOCACHI2CUT(30,''))" +StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25) & (MM>20*MeV)" +locations = updateDoD(StdLooseDetachedDiElectron) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKpi.py new file mode 100644 index 000000000..8f848d376 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedKpi.py @@ -0,0 +1,28 @@ +""" +Configuration file for Standard Loose Detached Kpi, +with Kpi invariant mass up to 2.2 GeV +""" + +__author__ = 'Jibo He' +__date__ = '22/01/2012' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles # , OfflineVertexFitter, OnOfflineTool +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +########################### +# StdDetachetKst2Kpi # +########################### +StdLooseDetachedKpi = CombineParticles("StdLooseDetachedKpi") +StdLooseDetachedKpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" +StdLooseDetachedKpi.Inputs = ["Phys/StdLooseKaons/Particles", + "Phys/StdLoosePions/Particles"] + +StdLooseDetachedKpi.CombinationCut = "(AM<2.2*GeV) & (ADOCACHI2CUT(30, ''))" +StdLooseDetachedKpi.MotherCut = "(VFASPF(VCHI2)<25)" + +locations = updateDoD(StdLooseDetachedKpi) + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py index 1622f0013..77934aded 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDownKaons.py @@ -8,7 +8,7 @@ # @date 2010-06-03 # ============================================================================= """ -Configuration file for 'Standard Loose Downstream Kaons' +Configuration file for 'Standard Loose Downstream Kaons' """ __author__ = "Yasmine Amhis <yasmine.amhis@epfl.ch> " __version__ = "" @@ -27,7 +27,7 @@ from CommonParticles.Utils import * algorithm = CombinedParticleMaker('StdLooseDownKaons', Particle = 'kaon' ) # configure the track selector -selector = trackSelector ( algorithm , trackTypes = ['Downstream']) +selector = trackSelector ( algorithm , trackTypes = ['Downstream'] ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py index 3db86b94a..45ee9d3e2 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseElectrons.py @@ -1,14 +1,12 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLoosePions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdLooseElectrons.py # configuration file for 'Standard Loose Electrons' # @author Patrick Koppenburg # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Electrons wioth loose cuts' +Configuration file for 'Standard Loose Electrons with loose tracking cuts' """ __author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" @@ -20,14 +18,12 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import FilterDesktop - - from CommonParticles.Utils import * ## create the algorithm -algorithm = FilterDesktop( 'StdLooseElectrons', - Inputs = ["Phys/StdAllLooseElectrons/Particles"], - Code = defaultCuts() ) +algorithm = FilterDesktop( 'StdLooseElectrons', + Inputs = ["Phys/StdAllLooseElectrons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -35,7 +31,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdLooseElectrons = algorithm - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py index 8c95001c2..bc117fe48 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKaons.py @@ -1,16 +1,14 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdLooseKaons.py # configuration file for 'Standard Loose Kaons' # @author Patrick Koppenburg # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Kaons wioth loose cuts' +Configuration file for 'Standard Loose Kaons' """ -__author__ = "Patrick Koppenburg " +__author__ = "Patrick Koppenburg" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( @@ -25,9 +23,9 @@ from Configurables import FilterDesktop from CommonParticles.Utils import * ## create the algorithm -algorithm = FilterDesktop( 'StdLooseKaons', - Inputs = ["Phys/StdAllLooseKaons/Particles"], - Code = defaultCuts() ) +algorithm = FilterDesktop( 'StdLooseKaons', + Inputs = ["Phys/StdAllLooseKaons/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -35,7 +33,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdLooseKaons = algorithm - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py index ecb4ca545..b3de148d7 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseKs.py @@ -16,11 +16,12 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 __all__ = ( 'StdLooseKsLL' , 'StdLooseKsDD' , + 'StdLooseKsLD' , 'locations' ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles, FilterDesktop from CommonParticles.Utils import * ## ============================================================================ @@ -43,17 +44,45 @@ locations = updateDoD ( StdLooseKsLL ) # @date 2009-04-27 # ============================================================================= StdLooseKsDD = CombineParticles ( 'StdLooseKsDD' ) - +DDPionCuts = "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)" StdLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ] StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" -StdLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)" } +StdLooseKsDD.DaughtersCuts = { "pi+" : DDPionCuts } StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV) & (ADOCACHI2CUT(25, ''))" StdLooseKsDD.MotherCut = "(ADMASS('KS0') < 64.*MeV) & (VFASPF(VCHI2) < 25.)" ## configure Data-On-Demand service locations.update( updateDoD ( StdLooseKsDD )) +## ============================================================================ +# configuration file for 'Standard Loose Long-Downstream ' +# Please be aware that this is mostly background +# @author Patrick Koppenburg +# @date 2012-01-26 +# ============================================================================= +# The one with a long pi+ +StdLooseKsLD_PosLong = StdLooseKsDD.clone( 'StdLooseKsLD_PosLong' ) + +StdLooseKsLD_PosLong.Inputs = [ "Phys/StdNoPIDsDownPions/Particles", + "Phys/StdLoosePions/Particles" ] +StdLooseKsLD_PosLong.DaughtersCuts = { "pi+" : "(ISLONG) & "+DDPionCuts, + "pi-" : "(ISDOWN) & "+DDPionCuts } + +# The one with a long pi- +StdLooseKsLD_NegLong = StdLooseKsLD_PosLong.clone( 'StdLooseKsLD_NegLong') +StdLooseKsLD_NegLong.DaughtersCuts = { "pi-" : "(ISLONG) & "+DDPionCuts, + "pi+" : "(ISDOWN) & "+DDPionCuts } +# The combination of them +StdLooseKsLD = FilterDesktop("StdLooseKsLD", Code = "ALL") +StdLooseKsLD.Inputs = [ "Phys/StdLooseKsLD_PosLong/Particles", + "Phys/StdLooseKsLD_NegLong/Particles" ] + +## configure Data-On-Demand service +locations.update( updateDoD ( StdLooseKsLD_PosLong )) +locations.update( updateDoD ( StdLooseKsLD_NegLong )) +locations.update( updateDoD ( StdLooseKsLD )) + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py index 1d8992dfe..450c92bd9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py @@ -20,12 +20,9 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import MergedPi0Maker - from GaudiKernel.SystemOfUnits import MeV - from CommonParticles.Utils import * - ## create the algorithm algorithm = MergedPi0Maker ( 'StdLooseMergedPi0' , DecayDescriptor = 'Pi0' , diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py index c263fed08..43a98b207 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseMuons.py @@ -20,8 +20,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import FilterDesktop - - from CommonParticles.Utils import * ## create the algorithm diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py index b40624c71..3ffb05c74 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhi.py @@ -3,7 +3,7 @@ # $Id: StdLoosePhi.py,v 1.6 2009-06-29 09:16:49 gcowan Exp $ # ============================================================================= ## @file CommonParticles/StdLoosePhi2KK.py -# configuration file for 'Standard Loose ' +# configuration file for 'Standard Loose Phi -> KK' # @author Greig Cowan # @date 2009-06-23 # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py index b0dd09b77..d511da688 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePhotons.py @@ -3,7 +3,7 @@ # $Id: StdLoosePhotons.py,v 1.2 2009-04-22 14:17:39 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdLoosePhotons.py -# configuration file for 'Standard Loose Pions' +# configuration file for 'Standard Loose Photons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl # @date 2009-01-14 # ============================================================================= @@ -21,12 +21,9 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import PhotonMakerAlg from Configurables import PhotonMaker - from GaudiKernel.SystemOfUnits import MeV - from CommonParticles.Utils import * - ## create the algorithm algorithm = PhotonMakerAlg ( 'StdLoosePhotons' , DecayDescriptor = 'Gamma' ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py b/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py index 14adf38eb..a4b77c20c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLoosePions.py @@ -20,14 +20,12 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import FilterDesktop - - from CommonParticles.Utils import * ## create the algorithm -algorithm = FilterDesktop( 'StdLoosePions', - Inputs = ["Phys/StdAllLoosePions/Particles"], - Code = defaultCuts() ) +algorithm = FilterDesktop( 'StdLoosePions', + Inputs = ["Phys/StdAllLoosePions/Particles"], + Code = defaultCuts() ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) @@ -35,7 +33,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdLoosePions = algorithm - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py index 02e5cbe03..d7e252ebf 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseProtons.py @@ -1,16 +1,14 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdLooseProtons.py # configuration file for 'Standard Loose Protons' # @author Patrick Koppenburg # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Protons wioth loose cuts' +Configuration file for 'Standard Loose Protons with loose cuts' """ -__author__ = "Patrick Koppenburg " +__author__ = "Patrick Koppenburg" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" # ============================================================================= __all__ = ( @@ -20,8 +18,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import FilterDesktop - - from CommonParticles.Utils import * ## create the algorithm @@ -35,7 +31,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdLooseProtons = algorithm - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py index 22b965cbf..711c56f72 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py @@ -3,7 +3,7 @@ # $Id: StdLooseResolvedEta.py,v 1.1 2010-01-06 11:04:12 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdLooseResolvedEta.py -# configuration file for 'Standard Loose Pions' +# configuration file for 'Standard Loose Resolved Etas' # @author Patrick Koppenburg # @date 2009-02-18 # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py index b2efa4b83..44079dda3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py @@ -3,7 +3,7 @@ # $Id: StdLooseResolvedPi0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ # ============================================================================= ## @file CommonParticles/StdLooseResolvedPi0.py -# configuration file for 'Standard Loose Pions' +# configuration file for 'Standard Loose Resolved Pi0s' # @author Patrick Koppenburg # @date 2009-02-18 # ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py index 4496ba108..abdb8ae37 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py @@ -24,8 +24,9 @@ from Configurables import NoPIDsParticleMaker from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownElectrons' , - DecayDescriptor = 'Electron' , Particle = 'electron' ) +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownElectrons' , + DecayDescriptor = 'Electron' , + Particle = 'electron' ) # configure the track selector selector = trackSelector ( algorithm , trackTypes = [ "Downstream" ]) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py index 7f9fc08c5..e4678ede7 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownPions.py @@ -24,12 +24,14 @@ from Configurables import NoPIDsParticleMaker from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownPions' , +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownPions' , DecayDescriptor = 'Pion' , Particle = 'pion' ) # configure the track selector -selector = trackSelector ( algorithm, trackTypes = ['Downstream'], cuts = { "Chi2Cut" : [0,10] } ) +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py index 2d0d7cc9a..b2bbdc2ca 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownProtons.py @@ -29,7 +29,9 @@ algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownProtons' , Particle = 'proton') # configure the track selector -selector = trackSelector ( algorithm, trackTypes = ['Downstream'], cuts = { "Chi2Cut" : [0,10] } ) +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py index e86505a6a..8ae7bb8f0 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsElectrons.py @@ -8,7 +8,7 @@ # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Electrons wioth loose cuts' +Configuration file for 'Standard NoPIDs Electrons with loose cuts' """ __author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py index 2aae7db13..89df00c1b 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsKaons.py @@ -8,7 +8,7 @@ # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Kaons wioth loose cuts' +Configuration file for 'Standard NoPIDs Kaons with loose cuts' """ __author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py index 370293bf8..ce8ff9a61 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsMuons.py @@ -8,7 +8,7 @@ # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Muons wioth loose cuts' +Configuration file for 'Standard NoPIDs Muons with loose cuts' """ __author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py index 4ea394895..18fa2f5c0 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsPions.py @@ -8,7 +8,7 @@ # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard NoPIDs Pions wioth loose cuts' +Configuration file for 'Standard NoPIDs Pions with loose cuts' """ __author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py new file mode 100755 index 000000000..3a2072a74 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNDownElectrons.py +# configuration file for 'Standard Tight ANN Downstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Downstream Electrons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNDownElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNDownElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +#fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNDownElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py new file mode 100755 index 000000000..36bac0965 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNDownKaons.py +# configuration file for 'Standard Tight ANN Downstream Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Downstream Kaons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNDownKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNDownKaons' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] +fltr.Selection = [ "ProbNNk>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNDownKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownMuons.py new file mode 100755 index 000000000..0b9196c96 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownMuons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNDownMuons.py +# configuration file for 'Standard Tight ANN Downstream Muons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Downstream Muons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNDownMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNDownMuons' , + Particle = 'muons' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +#fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ] +fltr.Selection = [ "ProbNNmu>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNDownMuons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py new file mode 100755 index 000000000..a05b8f627 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNDownPions.py +# configuration file for 'Standard Tight ANN Downstream Pions' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Downstream Pions using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNDownPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNDownPions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] +fltr.Selection = [ "ProbNNpi>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNDownPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py new file mode 100755 index 000000000..f14a41794 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNDownProtons.py +# configuration file for 'Standard Tight ANN Downstream Protons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Downstream Protons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNDownProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNDownProtons' , + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] +fltr.Selection = [ "ProbNNp>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNDownProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py new file mode 100755 index 000000000..ea48691cb --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightANNElectrons.py,v 1.5 2010-06-01 09:41:12 odescham Exp $ +# ============================================================================= +## @file CommonParticles/StdTightANNElectrons.py +# configuration file for 'Standard Loose Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight ANN Electrons' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNElectrons', + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +#fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] +#fltr.Selection = [ "ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.35'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNKaons.py new file mode 100755 index 000000000..32d682148 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNKaons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNKaons.py +# configuration file for 'Standard Tight Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Kaons' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdTightANNKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNKaons', + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.15'" ] +fltr.Selection = [ "ProbNNk>'0.05'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py new file mode 100755 index 000000000..de8326e3a --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightANNMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdTightANNMuons.py +# configuration file for 'Standard Tight Muons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Muons' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +# ============================================================================= +__all__ = ( + 'StdTightANNMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNMuons' , + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +#fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ] +fltr.Selection = [ "ProbNNmu>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNMuons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py new file mode 100755 index 000000000..1d41a180e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNPions.py +# configuration file for 'Standard Tight Pions' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight ANN Pions' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdTightANNPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNPions', + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +fltr.Selection = [ "ProbNNpi>'0.55'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py new file mode 100755 index 000000000..85a279799 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdTightANNProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdTightANNProtons.py +# configuration file for 'Standard Tight ANN Protons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight ANN Protons' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdTightANNProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNProtons', + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.125'" ] +fltr.Selection = [ "ProbNNp>'0.021'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py new file mode 100755 index 000000000..161ec60cb --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNUpElectrons.py +# configuration file for 'Standard Tight ANN Upstream Electrons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Upstream Electrons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNUpElectrons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNUpElectrons' , + Particle = 'electron' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNUpElectrons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py new file mode 100755 index 000000000..b6ac65a34 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNUpKaons.py +# configuration file for 'Standard Tight ANN Upstream Kaons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Upstream Kaons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNUpKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNUpKaons' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] +fltr.Selection = [ "ProbNNk>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNUpKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpMuons.py new file mode 100755 index 000000000..71f019d3e --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpMuons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNUpMuons.py +# configuration file for 'Standard Loose ANN Upstream Muons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Loose Upstream Muons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNUpMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNUpMuons' , + Particle = 'muons' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNmu>'0.1'" ] +fltr.Selection = [ "ProbNNmu>'0.1'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNUpMuons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py new file mode 100755 index 000000000..6e058e832 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNUpPions.py +# configuration file for 'Standard Tight ANN Upstream Pions' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Upstream Pions using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNUpPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNUpPions' , + Particle = 'pion' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] +fltr.Selection = [ "ProbNNpi>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNUpPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py new file mode 100755 index 000000000..f91068af7 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdTightANNUpProtons.py +# configuration file for 'Standard Tight ANN Upstream Protons' +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for 'Standard Tight Upstream Protons using ANN PID' +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdTightANNUpProtons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleCALOFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdTightANNUpProtons' , + Particle = 'proton' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Upstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) +#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] +fltr.Selection = [ "ProbNNp>'0.2'" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdTightANNUpProtons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py index 61ff31f67..a73a5058d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightElectrons.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdTightElectrons.py,v 1.5 2010-06-01 09:41:12 odescham Exp $ -# ============================================================================= ## @file CommonParticles/StdTightElectrons.py # configuration file for 'Standard Loose Electrons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py index 9a7282f9a..75ebcd9a3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightKaons.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdTightKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdTightKaons.py # configuration file for 'Standard Tight Kaons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl @@ -20,8 +18,6 @@ __all__ = ( # ============================================================================= from Gaudi.Configuration import * from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker - - from CommonParticles.Utils import * ## create the algorithm @@ -41,7 +37,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdTightKaons = algorithm - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py index 8992fd180..0029fa9c6 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightMuons.py @@ -22,12 +22,11 @@ from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleMUONFilter - from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdTightMuons' , - Particle = 'muon' ) +algorithm = CombinedParticleMaker ( 'StdTightMuons' , + Particle = 'muon' ) # configure the track selector selector = trackSelector ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightPhi.py b/Phys/CommonParticles/python/CommonParticles/StdTightPhi.py new file mode 100755 index 000000000..110f46888 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightPhi.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +""" +Configuration file for 'Standard Tight Phi2KK'. Lieftime unbiased. +""" +__author__ = "Jibo He" +__date__ = "3/2/2012" + +# ============================================================================= +__all__ = ( + 'StdTightPhi2KK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdTightPhi2KK = CombineParticles("StdTightPhi2KK") +StdTightPhi2KK.Inputs = ["Phys/StdTightKaons/Particles"] +StdTightPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-" +StdTightPhi2KK.DaughtersCuts = { "K+" : "(PT>500*MeV)" } +StdTightPhi2KK.CombinationCut = "(ADAMASS('phi(1020)')<30*MeV) & (ADOCACHI2CUT(30, ''))" +StdTightPhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)" + +## configure Data-On-Demand service +locations = updateDoD ( StdTightPhi2KK ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightPions.py index 1f6587a08..b12bf4c08 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightPions.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdTightPions.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdTightPions.py # configuration file for 'Standard Tight Pions' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl @@ -25,8 +23,8 @@ from Configurables import ProtoParticleCALOFilter from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdTightPions', - Particle = 'pion' ) +algorithm = CombinedParticleMaker ( 'StdTightPions', + Particle = 'pion' ) # configure the track selector selector = trackSelector ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py index 9186d97df..064155c93 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightProtons.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdTightProtons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= ## @file CommonParticles/StdTightProtons.py # configuration file for 'Standard Tight Protons' # @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl @@ -21,12 +19,10 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import CombinedParticleMaker from Configurables import ProtoParticleCALOFilter - - from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdTightProtons', Particle = 'proton' ) +algorithm = CombinedParticleMaker ( 'StdTightProtons', Particle = 'proton' ) # configure the track selector selector = trackSelector ( algorithm ) @@ -41,7 +37,6 @@ locations = updateDoD ( algorithm ) ## finally: define the symbol StdTightProtons = algorithm - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py index de3521ca6..71877c18f 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDetachedKstar.py @@ -19,10 +19,12 @@ StdVeryLooseDetachedKst2Kpi = CombineParticles("StdVeryLooseDetachedKst2Kpi") StdVeryLooseDetachedKst2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc" StdVeryLooseDetachedKst2Kpi.Inputs = ["Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles"] -StdVeryLooseDetachedKst2Kpi.DaughtersCuts = { - "K+" :"(MIPCHI2DV(PRIMARY)>2.25)", - "pi-":"(MIPCHI2DV(PRIMARY)>2.25)" - } + +## # IPCHI2>4 already applied on StdLoose{Kaons,Pions} +## StdVeryLooseDetachedKst2Kpi.DaughtersCuts = { +## "K+" :"(MIPCHI2DV(PRIMARY)>2.25)", +## "pi-":"(MIPCHI2DV(PRIMARY)>2.25)" +## } StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV) & (ADOCACHI2CUT(30, ''))" StdVeryLooseDetachedKst2Kpi.MotherCut = "(VFASPF(VCHI2)<25)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py index 29d2eee66..3c84c2bfb 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseDiMuon.py @@ -1,5 +1,5 @@ """ -Configuration file for Standard Loose DiMuon, very loose for penguins +Configuration file for Standard Loose DiMuon, very loose for penguins (and other small animals). """ __author__ = 'Rob Lambert' diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py index 2107d3593..ef00303be 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py @@ -3,7 +3,7 @@ # $Id: StdVeryLooseKs.py,v 1.5 2009-05-26 13:48:13 shaines Exp $ # ============================================================================= ## @file CommonParticles/StdLooseVeryKs.py -# configuration file for 'Standard Very Loose ' +# configuration file for 'Standard Very Loose Ks' # @author Susan Haines # @date 2011-08-27 # ============================================================================= @@ -32,7 +32,7 @@ StdVeryLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" StdVeryLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (P < 100.*GeV) & (BPVIPCHI2() > 9.)" } StdVeryLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 35.*MeV) & (AMINDOCA('LoKi::TrgDistanceCalculator')<1.5)" -StdVeryLooseKsLL.MotherCut = "(ADMASS('KS0') < 20.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.) " +StdVeryLooseKsLL.MotherCut = "(ADMASS('KS0') < 30.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.) " ## configure Data-On-Demand service locations = updateDoD ( StdVeryLooseKsLL ) @@ -49,7 +49,7 @@ StdVeryLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" StdVeryLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (P < 100.*GeV) & (BPVIPCHI2() > 6.25) & ((-PIDK) > 0.)" } StdVeryLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (AMINDOCA('LoKi::TrgDistanceCalculator')<22.)" -StdVeryLooseKsDD.MotherCut = "(ADMASS('KS0') < 28.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.)" +StdVeryLooseKsDD.MotherCut = "(ADMASS('KS0') < 42.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.)" ## configure Data-On-Demand service locations.update( updateDoD ( StdVeryLooseKsDD )) diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambda.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambda.py new file mode 100644 index 000000000..c7695fddb --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseLambda.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseLambda.py,v 1.2 2010-08-24 17:48:00 yamhis Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseLambda.py +# configuration file for 'Standard Loose ' +# @author Patrick Koppenburg +# @date 2009-02-18 +# ============================================================================= +""" +Configuration file for 'Standard Very Loose Lambda' +""" +__author__ = "Thomas Blake" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdVeryLooseLambdaLL' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdVeryLooseLambdaLL = CombineParticles ( 'StdVeryLooseLambdaLL' ) + + +StdVeryLooseLambdaLL.Inputs = [ "Phys/StdAllNoPIDsPions/Particles", + "Phys/StdAllNoPIDsProtons/Particles" ] + +StdVeryLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc" + +StdVeryLooseLambdaLL.DaughtersCuts = { + "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)", + "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)" + } + +StdVeryLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(30, ''))" +StdVeryLooseLambdaLL.MotherCut = "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30) & (BPVVDCHI2 > 4.)" + +## configure Data-On-Demand service +locations = updateDoD ( StdVeryLooseLambdaLL ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py index abf127ad9..7dcb2a236 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseMuons.py @@ -3,12 +3,12 @@ # $Id: StdLooseMuons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ # ============================================================================= ## @file CommonParticles/StdVeryLooseMuons.py -# configuration file for 'Standard Loose Muons' +# configuration file for 'Standard Very Loose Muons' # @author Patrick Koppenburg # @date 2011-07-18 # ============================================================================= """ -Configuration file for 'Standard Loose Muons woth loose cuts' +Configuration file for 'Standard Loose Muons with very loose cuts' """ __author__ = "Patrick Koppenburg " __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" -- GitLab From d0ff9e4a1fcc959f5ae5fe2716c6c4901050aae6 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:04:05 +0100 Subject: [PATCH 11/50] v4r1 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 14 ++++++ .../CommonParticles/StdLooseResolvedEta.py | 45 ++++++++++++------- .../CommonParticles/StdLooseResolvedPi0.py | 39 ++++++++++------ 5 files changed, 71 insertions(+), 31 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 1a2319c19..4dcba8019 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r6 +version v8r7 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index fa6c31c45..1ba20864c 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r6 +v8r7 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index b50a19c29..ac14161b9 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,20 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r7 2012-03-01 ========================= + +! 2012-02-21 - Vanya Belyaev + + - StdLooseResolvedPi0.py: + + add "wide" pi0->gamma gamma + +! 2012-02-19 - Vanya Belyaev + + - StdLooseResolvedEta.py: + + add "wide" eta->gamma gamma + !========================= CommonParticles v8r6 2012-02-10 ========================= ! 2012-02-03 - Jibo He - Added StdTightPhi, using StdTightKaons. diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py index 711c56f72..af92a33ac 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedEta.py @@ -14,35 +14,50 @@ __author__ = "Patrick Koppenburg" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" # ============================================================================= __all__ = ( + 'StdLooseEta2gg' , 'StdLooseResolvedEta' , 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import ResolvedPi0Maker, PhotonMaker - +from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import MeV -from CommonParticles.Utils import * - +# =========================================================== +## create the algorithm, eta in wide mass-window +from Configurables import ResolvedPi0Maker, PhotonMaker +wide = ResolvedPi0Maker ( + 'StdLooseEta2gg' , + DecayDescriptor = 'Eta' , + MassWindow = 105 * MeV , + Particle = 'eta' ) -## create the algorithm -algorithm = ResolvedPi0Maker ( 'StdLooseResolvedEta' , - DecayDescriptor = 'Eta', - MassWindow = 50.* MeV, - Particle = 'eta') -algorithm.addTool(PhotonMaker) -algorithm.PhotonMaker.PtCut = 200.*MeV +wide.addTool(PhotonMaker) +wide.PhotonMaker.PtCut = 200 * MeV ## configure Data-On-Demand service -locations = updateDoD ( algorithm ) +locations = updateDoD ( wide ) +## finally: define the symbol +StdLooseEta2gg = wide + +# ============================================================================ +## filter the ``standard''-mass window +from Configurables import FilterDesktop +fltr = FilterDesktop ( + 'StdLooseResolvedEta' , + Code = "ADMASS('eta') < 50 * MeV " , + Inputs = [ + 'Phys/%s/Particles' % wide.name() + ] + ) ## finally: define the symbol -StdLooseResolvedEta = algorithm +StdLooseResolvedEta = fltr +## configure Data-On-Demand service +locations.update ( updateDoD ( fltr ) ) ## ============================================================================ if '__main__' == __name__ : - + print __doc__ print __author__ print __version__ diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py index 44079dda3..34be80b83 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py @@ -14,30 +14,41 @@ __author__ = "Patrick Koppenburg" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" # ============================================================================= __all__ = ( + 'StdLoosePi02gg' , 'StdLooseResolvedPi0' , 'locations' ) # ============================================================================= -from Gaudi.Configuration import * -from Configurables import ResolvedPi0Maker, PhotonMaker - from GaudiKernel.SystemOfUnits import MeV - -from CommonParticles.Utils import * - +from CommonParticles.Utils import * ## create the algorithm -algorithm = ResolvedPi0Maker ( 'StdLooseResolvedPi0' , - DecayDescriptor = 'Pi0', - MassWindow = 30.* MeV ) -algorithm.addTool(PhotonMaker) -algorithm.PhotonMaker.PtCut = 200.*MeV +from Configurables import ResolvedPi0Maker, PhotonMaker +wide = ResolvedPi0Maker ( 'StdLoosePi02gg' , + DecayDescriptor = 'Pi0' , + MassWindow = 60.* MeV ) +wide.addTool(PhotonMaker) +wide.PhotonMaker.PtCut = 200.*MeV ## configure Data-On-Demand service -locations = updateDoD ( algorithm ) - +locations = updateDoD ( wide ) +## define the symbol: +StdLoosePi02gg = wide + +# ============================================================================ +## filter the ``standard''-mass window +from Configurables import FilterDesktop +fltr = FilterDesktop ( + 'StdLooseResolvedPi0' , + Code = "ADMASS('pi0') < 30 * MeV " , + Inputs = [ + 'Phys/%s/Particles' % wide.name() + ] + ) +## configure Data-On-Demand service +locations.update ( updateDoD ( fltr ) ) ## finally: define the symbol -StdLooseResolvedPi0 = algorithm +StdLooseResolvedPi0 = fltr ## ============================================================================ if '__main__' == __name__ : -- GitLab From a93ac6050a75667454cdcd55d33324d51f272c25 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:04:34 +0100 Subject: [PATCH 12/50] v4r3 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 6 ++++ .../python/CommonParticles/StdTightDplus.py | 29 ++++++++++++++++++- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 4dcba8019..513d38d39 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r7 +version v8r8 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 1ba20864c..14f82bbb8 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r7 +v8r8 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index ac14161b9..0d8465c10 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,12 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r8 2012-04-27 ========================= + +! 2012-04-25 - Sandra Amato + - StdTightDplus: + added StdTightDplus2PPP + !========================= CommonParticles v8r7 2012-03-01 ========================= ! 2012-02-21 - Vanya Belyaev diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py b/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py index 8f47c690c..e44590612 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py @@ -8,7 +8,11 @@ Configuration file for 'Standard Tight Dplus'""" __author__ = "Sandra Amato" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.8 $" # ============================================================================= -__all__ = ( 'StdTightDplus2KPiPiOppSignPi' ,'locations') +__all__ = ( + 'StdTightDplus2KPiPiOppSignPi' , + 'StdVeryTightDsplus2KKPi', + 'locations' + ) from Gaudi.Configuration import * from Configurables import CombineParticles from CommonParticles.Utils import * @@ -27,6 +31,29 @@ StdTightDplus2KPiPiOppSignPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1770.*MeV) locations = updateDoD ( StdTightDplus2KPiPiOppSignPi ) +## =========================================================================== +StdVeryTightDsplus2KKPi = CombineParticles( 'StdVeryTightDsplus2KKPi' ) +StdVeryTightDsplus2KKPi.Inputs = [ "Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles" ] +StdVeryTightDsplus2KKPi.DecayDescriptor = "[D_s+ -> K- K+ pi+]cc" +StdVeryTightDsplus2KKPi.DaughtersCuts = { + "K+" : "(P > 2*GeV) & ((PIDK-PIDpi) > 5.)", + "pi+" : "(P > 2*GeV) & ((PIDK-PIDpi) < 5.)" + } +StdVeryTightDsplus2KKPi.CombinationCut = "((AM>1900.*MeV) & (AM<2040.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))" +StdVeryTightDsplus2KKPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1920.*MeV) & (M < 2020.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" +locations = updateDoD ( StdVeryTightDsplus2KKPi ) + +########################################################################################## +# D+ -> 3 pi is a clone of D+ -> K Pi Pi +# +from StdLooseDplus import StdLooseDplus2KPiPi +StdTightDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdTightDplus2PiPiPi") +StdTightDplus2PiPiPi.Inputs = [ "Phys/StdLoosePions/Particles" ] +StdTightDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" +StdTightDplus2PiPiPi.DaughtersCuts = {"pi+" : "(P > 2*GeV) & ((PIDK-PIDpi) < 3.) & ((MIPCHI2DV(PRIMARY)) > 6.0 )"} +locations = updateDoD ( StdTightDplus2PiPiPi ) +########################################################################################## + ## ============================================================================ if '__main__' == __name__ : -- GitLab From 05b061a360c55c3e5dbb1eddcad024bb7179f240 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:05:00 +0100 Subject: [PATCH 13/50] v5r0 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 23 +++++- .../python/CommonParticles/StandardPhotons.py | 13 ++++ .../python/CommonParticles/StandardV0.py | 3 + .../CommonParticles/StdAllLooseElectrons.py | 6 +- .../StdAllLooseGammaConversion.py | 66 +++++++++++++++++ .../StdAllTightGammaConversion.py | 66 +++++++++++++++++ .../StdAllTightSymGammaConversion.py | 70 +++++++++++++++++++ .../CommonParticles/StdLooseDiElectron.py | 21 +++++- .../python/CommonParticles/StdV0FromBrunel.py | 51 ++++++++++++++ .../CommonParticles/StdVeryLooseAllPhotons.py | 54 ++++++++++++++ 12 files changed, 368 insertions(+), 9 deletions(-) create mode 100644 Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 513d38d39..6e5b3946b 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r8 +version v8r9 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 14f82bbb8..c0bfd590d 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r8 +v8r9 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 0d8465c10..9bb96f9d0 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -1,13 +1,34 @@ !$Id: release.notes,v 1.194 2010-09-09 08:44:10 jpalac Exp $ !----------------------------------------------------------------------------- ! Package : Phys/CommonParticles -! Responsible : P. Koppenburg, Juan Palacios +! Responsible : P. Koppenburg, Chris Jones ! Purpose : Common particles ! ! When adding a Particle make sure it is appended to one of the Standard* files ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r9 2012-06-28 ========================= + +! 2012-05-23 - Olivier Deschamps + - StdVeryLooseAllPhotons.py: decrease photon pT cut to 75MeV (for bremStrahlung) + +! 2012-06-18 - Patrick Koppenburg + - StdLooseDiElectron : Make a DiElectron for B->eeK(*) using DiElectronMaker + called `StdDiElectronFromTracks' + +! 2012-06-12 - Olivier Deschamps for Edwige Tournefier + - add StdAllTightSymGammaConversion.py : combinatorial gamma->ee from symmetrized e pT + +! 2012-06-12 - Olivier Deschamps + - StdAllLoose(Tight)GammaConversion.py : produce gamma->ee particle (based on DiElectronMaker) + +! 2012-05-14 - Olivier Deschamps + - StdVeryLooseAllPhotons.py: photons with pT threshold down to 100 MeV (for new BremStrahlung recovery) + +! 2012-06-8 - P. Koppenburg + - New StdKsFromV0 that make Ks particles from the V0 Brunel objects. + !========================= CommonParticles v8r8 2012-04-27 ========================= ! 2012-04-25 - Sandra Amato diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py b/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py index 8981f4365..dde8f3de1 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardPhotons.py @@ -25,6 +25,19 @@ _locations.update ( locations ) from CommonParticles.StdLooseAllPhotons import * _locations.update ( locations ) +from CommonParticles.StdVeryLooseAllPhotons import * +_locations.update ( locations ) + +from CommonParticles.StdAllLooseGammaConversion import * +_locations.update ( locations ) + +from CommonParticles.StdAllTightGammaConversion import * +_locations.update ( locations ) + +from CommonParticles.StdAllTightSymGammaConversion import * +_locations.update ( locations ) + + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardV0.py b/Phys/CommonParticles/python/CommonParticles/StandardV0.py index 14c524c79..ad2e44ad0 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardV0.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardV0.py @@ -28,6 +28,9 @@ _locations.update ( locations ) from CommonParticles.StdVeryLooseLambda import * _locations.update ( locations ) +from CommonParticles.StdV0FromBrunel import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py index 1373b7eca..d75d3fed7 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseElectrons.py @@ -24,16 +24,12 @@ from Configurables import ProtoParticleCALOFilter from CommonParticles.Utils import * ## create the algorithm -algorithm = CombinedParticleMaker ( 'StdAllLooseElectrons' , - Particle = 'electron' ) - +algorithm = CombinedParticleMaker ( 'StdAllLooseElectrons' ,Particle = 'electron' ) # configure the track selector selector = trackSelector ( algorithm ) - # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) fltr.Selection = [ "RequiresDet='CALO' CombDLL(e-pi)>'-2.0'" ] - ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py new file mode 100644 index 000000000..f62a8e508 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard DiElectrons from gamma conversion' +""" +__author__ = "Olivier Deschamps : Olivier.Deschamps @cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdAllLooseGammaLL' , + 'StdAllLooseGammaDD' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * +from GaudiKernel.SystemOfUnits import * + + +###--- Long pair +from Configurables import DiElectronMaker,ProtoParticleCALOFilter +dieLL = DiElectronMaker('StdAllLooseGammaLL') +dieLL.DecayDescriptor = "gamma -> e+ e-" +selector = trackSelector ( dieLL , trackTypes = [ "Long"]) +dieLL.addTool( ProtoParticleCALOFilter('Electron')) +dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] +dieLL.DeltaY = 3. +dieLL.DeltaYmax = 200 * mm +dieLL.DiElectronMassMax = 100.*MeV +dieLL.DiElectronPtMin = 200.*MeV +locations = updateDoD ( dieLL ) +StdAllLooseGammaLL=dieLL + +###--- Downstream pair +dieDD = DiElectronMaker('StdAllLooseGammaDD') +dieDD.DecayDescriptor = "gamma -> e+ e-" +selector = trackSelector ( dieDD , trackTypes = [ "Downstream"]) +dieDD.addTool( ProtoParticleCALOFilter('Electron')) +dieDD.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] +dieDD.DeltaY = 3. +dieDD.DeltaYmax = 200 * mm +dieDD.DiElectronMassMax = 100.*MeV +dieDD.DiElectronPtMin = 200.*MeV +locations.update( updateDoD ( dieDD )) +StdAllLooseGammaDD=dieDD + + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py new file mode 100644 index 000000000..a8050b41d --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard DiElectrons from gamma conversion' +""" +__author__ = "Olivier Deschamps : Olivier.Deschamps @cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdAllTightGammaLL' , + 'StdAllTightGammaDD' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * +from GaudiKernel.SystemOfUnits import * + + +###--- Long pair +from Configurables import DiElectronMaker,ProtoParticleCALOFilter +dieLL = DiElectronMaker('StdAllTightGammaLL') +dieLL.DecayDescriptor = "gamma -> e+ e-" +selector = trackSelector ( dieLL , trackTypes = [ "Long"]) +dieLL.addTool( ProtoParticleCALOFilter('Electron')) +dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] +dieLL.DeltaY = 3. +dieLL.DeltaYmax = 200 * mm +dieLL.DiElectronMassMax = 100.*MeV +dieLL.DiElectronPtMin = 200.*MeV +locations = updateDoD ( dieLL ) +StdAllTightGammaLL=dieLL + +###--- Downstream pair +dieDD = DiElectronMaker('StdAllTightGammaDD') +dieDD.DecayDescriptor = "gamma -> e+ e-" +selector = trackSelector ( dieDD , trackTypes = [ "Downstream"]) +dieDD.addTool( ProtoParticleCALOFilter('Electron')) +dieDD.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] +dieDD.DeltaY = 3. +dieDD.DeltaYmax = 200 * mm +dieDD.DiElectronMassMax = 100.*MeV +dieDD.DiElectronPtMin = 200.*MeV +locations.update( updateDoD ( dieDD ) ) +StdAllTightGammaDD=dieDD + + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py new file mode 100644 index 000000000..48e94f320 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownElectrons.py,v 1.1 2010-08-11 12:43:05 ukerzel Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsElectrons.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard DiElectrons from gamma conversion with PT reversed for background studies' +""" +__author__ = "Olivier Deschamps : Olivier.Deschamps @cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" +# ============================================================================= +__all__ = ( + 'StdAllTightSymGammaLL' , + 'StdAllTightSymGammaDD' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * +from GaudiKernel.SystemOfUnits import * + + +###--- Long pair +from Configurables import DiElectronMaker,ProtoParticleCALOFilter +dieSymLL = DiElectronMaker('StdAllTightSymGammaLL') +dieSymLL.DecayDescriptor = "gamma -> e+ e-" +selector = trackSelector ( dieSymLL , trackTypes = [ "Long"]) +dieSymLL.addTool( ProtoParticleCALOFilter('Electron')) +dieSymLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] +dieSymLL.DeltaY = 3. +dieSymLL.DeltaYmax = 200 * mm +dieSymLL.DiElectronMassMax = 100.*MeV +dieSymLL.DiElectronPtMin = 400.*MeV +dieSymLL.SymetricPair = True + +locations = updateDoD ( dieSymLL ) +StdAllTightSymGammaLL=dieSymLL + +###--- Downstream pair +dieSymDD = DiElectronMaker('StdAllTightSymGammaDD') +dieSymDD.DecayDescriptor = "gamma -> e+ e-" +selector = trackSelector ( dieSymDD , trackTypes = [ "Downstream"]) +dieSymDD.addTool( ProtoParticleCALOFilter('Electron')) +dieSymDD.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] +dieSymDD.DeltaY = 3. +dieSymDD.DeltaYmax = 200 * mm +dieSymDD.DiElectronMassMax = 100.*MeV +dieSymDD.DiElectronPtMin = 400.*MeV +dieSymDD.SymetricPair = True + +locations.update( updateDoD ( dieSymDD ) ) +StdAllTightSymGammaDD=dieSymDD + + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index 4f064947f..63bba307e 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -14,7 +14,9 @@ import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDiElectron # ########################### - +""" +Standard Di-Electron maker from 2 electrons +""" StdLooseDiElectron = CombineParticles("StdLooseDiElectron") StdLooseDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] @@ -23,6 +25,23 @@ StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30,''))" StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDiElectron) +""" +Using Olivier's Di-Electron Particle Maker +""" +###--- From Olivier's ParticleMaker +from Configurables import DiElectronMaker,ProtoParticleCALOFilter +from GaudiKernel.SystemOfUnits import * +dieLL = DiElectronMaker('StdDiElectronFromTracks') +dieLL.Particle = "J/psi(1S)" +selector = trackSelector ( dieLL , trackTypes = [ "Long"]) +dieLL.addTool( ProtoParticleCALOFilter('Electron')) +dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] +dieLL.DiElectronMassMax = 5000.*MeV +dieLL.DiElectronMassMin = 0.*MeV +dieLL.DiElectronPtMin = 200.*MeV +locations = updateDoD ( dieLL ) +StdDiElectronFromTracks = dieLL + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py new file mode 100755 index 000000000..6110491ae --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseKs.py,v 1.5 2009-05-26 13:48:13 gcowan Exp $ +# ============================================================================= +## @file CommonParticles/StdV0FromBrunel.py +# configuration file for 'Standard Loose ' +# @author Patrick Koppenburg +# @date 2012-06-08 +# ============================================================================= +""" +Configuration file for 'Standard Loose Ks' +""" +__author__ = "Patrick Koppenburg" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'V0Maker' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import DataOnDemandSvc, V0FromDstMaker +from CommonParticles.Utils import * +locations = {} + +# One algorithm does all V0 +v0locations = [ "StdKs2PiPiLL" , + "StdKs2PiPiDD" , + "StdLambda2PPiLL" , + "StdLambda2PPiDD" ] +hat = "Phys/" +V0Maker = V0FromDstMaker() + +dod = DataOnDemandSvc() + +for v0 in v0locations: + p = { hat + v0 + '/Particles' : V0Maker.getFullName() } + dod.AlgMap.update( p ) + locations.update ( p ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locations + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py new file mode 100644 index 000000000..63ed77903 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseAllPhotons.py,v 1.2 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseAllPhotons.py +# configuration file for 'Standard Loose All Photons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Very Loose All Photons' +""" +__author__ = "Olivier Deschamps odescham@in2p3.fr" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" +# ============================================================================= +__all__ = ( + 'StdLooseAllPhotons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import PhotonMakerAlg +from Configurables import PhotonMaker +from GaudiKernel.SystemOfUnits import MeV +from CommonParticles.Utils import * + +## create the algorithm +algorithm = PhotonMakerAlg ( 'StdVeryLooseAllPhotons' , + DecayDescriptor = 'Gamma' ) + +# configure desktop&particle maker: +algorithm.addTool ( PhotonMaker , name = 'PhotonMaker' ) +photon = algorithm.PhotonMaker +photon.ConvertedPhotons = True +photon.UnconvertedPhotons = True +photon.PtCut = 75 * MeV + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseAllPhotons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From 8e012291a1e4ad818379980b98146bb92574a76e Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:05:40 +0100 Subject: [PATCH 14/50] v6r2 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 17 +++++ .../python/CommonParticles/StandardDipion.py | 40 +++++++++++ .../CommonParticles/StandardIntermediate.py | 4 ++ .../python/CommonParticles/StandardTau.py | 40 +++++++++++ .../python/CommonParticles/StandardV0.py | 3 - .../CommonParticles/StdLooseDetachedTau.py | 58 ++++++++++++++++ .../python/CommonParticles/StdLooseDipion.py | 56 ++++++++++++++++ .../CommonParticles/StdVeryLooseAllPhotons.py | 4 +- .../python/CommonParticles/StdVeryLooseKs.py | 67 ------------------- .../tests/test_inputlocations_consistency.py | 1 + 12 files changed, 220 insertions(+), 74 deletions(-) create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardDipion.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardTau.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py delete mode 100644 Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 6e5b3946b..65c140ead 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r9 +version v8r10 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index c0bfd590d..0192da05c 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r9 +v8r10 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 9bb96f9d0..b9c4961e0 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,23 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r10 2012-09-01 ========================= + +! 2012-09-01 - Anton Poluektov + - fix test_inputlocations_consistency + +! 2012-08-30 - Olivier Deschamps + - fix typo in StdVeryLooseAllPhotons name + +! 2012-08-24 - Susan Haines +- Removed StdVeryLooseKs.py +- Removed lines related to StdVeryLooseKs from StandardV0.py + +! 2012-08-23 - Thomas Blake + - Added StandardTau and StandardDipion to StandardIntermediate + + + !========================= CommonParticles v8r9 2012-06-28 ========================= ! 2012-05-23 - Olivier Deschamps diff --git a/Phys/CommonParticles/python/CommonParticles/StandardDipion.py b/Phys/CommonParticles/python/CommonParticles/StandardDipion.py new file mode 100755 index 000000000..9ed70ce7d --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardDipion.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardDipion.py,v1.0 2012-08-07 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StandardDipion.py +# configuration file for 'Standard Dipion' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 +# ============================================================================= +""" +Configuration file for 'Standard Dipion' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseDipion import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py index 4d84e266e..8820ee512 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py @@ -38,6 +38,10 @@ from CommonParticles.StandardDiElectron import * _locations.update ( locations ) from CommonParticles.StandardLambdac import * _locations.update ( locations ) +from CommonParticles.StandardTau import * +_locations.update ( locations ) +from CommonParticles.StandardDipion import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardTau.py b/Phys/CommonParticles/python/CommonParticles/StandardTau.py new file mode 100755 index 000000000..d78775211 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardTau.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardTau.py,v1.0 2012-08-07 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StandardTau.py +# configuration file for 'Standard Tau' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 +# ============================================================================= +""" +Configuration file for 'Standard Tau' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseDetachedTau import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StandardV0.py b/Phys/CommonParticles/python/CommonParticles/StandardV0.py index ad2e44ad0..30da35deb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardV0.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardV0.py @@ -22,9 +22,6 @@ _locations.update ( locations ) from CommonParticles.StdLooseLambda import * _locations.update ( locations ) -from CommonParticles.StdVeryLooseKs import * -_locations.update ( locations ) - from CommonParticles.StdVeryLooseLambda import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py new file mode 100755 index 000000000..3b2e81963 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDetachedTau.py,v 1.0 2012-08-07 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDetachedTau.py +# configuration file for 'Standard Loose Detached Tau' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 +# ============================================================================= +""" +Configuration file for 'Standard Loose Detached Tau' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= +__all__ = ( + 'StdLooseDetachedTau3pi', + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseDetachedTau3pi = CombineParticles ( 'StdLooseDetachedTau3pi' ) + +StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLooseDetachedDipion/Particles", + "Phys/StdLoosePions/Particles" ] +StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> rho(770)0 pi+]cc", + "[tau+ -> rho(770)+ pi-]cc"] +StdLooseDetachedTau3pi.DaughtersCuts = { + "rho(770)0" : "ALL", + "rho(770)+" : "ALL", + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + } + +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds + +StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<1800.*MeV)) & (ADOCAMAX('')<0.15*mm)" +StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 1800.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDetachedTau3pi ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py new file mode 100755 index 000000000..adb473000 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDipion.py,v 1.8 2012-08-07 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDipion.py +# configuration file for 'Standard Loose Detached Tau' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 +# ============================================================================= +""" +Configuration file for 'Standard Loose Dipion' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= +__all__ = ( + 'StdLooseDetachedDipion', + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm +StdLooseDetachedDipion = CombineParticles ( 'StdLooseDetachedDipion' ) + +StdLooseDetachedDipion.Inputs = [ "Phys/StdLoosePions/Particles" ] +StdLooseDetachedDipion.DecayDescriptors = ["rho(770)0 -> pi+ pi-", + "[rho(770)+ -> pi+ pi+]cc"] +StdLooseDetachedDipion.DaughtersCuts = { + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", + "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + } + +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds + +StdLooseDetachedDipion.CombinationCut = "(ANUM(PT < 300*MeV) <= 1) & (ADOCAMAX('') < 0.25*mm) & (AM<1670.*MeV)" +StdLooseDetachedDipion.MotherCut = "(VFASPF(VCHI2) < 9.0) & (MIPCHI2DV(PRIMARY) > 5.0) & (VFASPF(VMINVDDV(PRIMARY)) > 2.0*mm)" + +## configure Data-On-Demand service +locations = updateDoD (StdLooseDetachedDipion ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py index 63ed77903..139257f38 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseAllPhotons.py @@ -14,7 +14,7 @@ __author__ = "Olivier Deschamps odescham@in2p3.fr" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 $" # ============================================================================= __all__ = ( - 'StdLooseAllPhotons' , + 'StdVeryLooseAllPhotons' , 'locations' ) # ============================================================================= @@ -39,7 +39,7 @@ photon.PtCut = 75 * MeV locations = updateDoD ( algorithm ) ## finally: define the symbol -StdLooseAllPhotons = algorithm +StdVeryLooseAllPhotons = algorithm ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py b/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py deleted file mode 100644 index ef00303be..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdVeryLooseKs.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python -# ============================================================================= -# $Id: StdVeryLooseKs.py,v 1.5 2009-05-26 13:48:13 shaines Exp $ -# ============================================================================= -## @file CommonParticles/StdLooseVeryKs.py -# configuration file for 'Standard Very Loose Ks' -# @author Susan Haines -# @date 2011-08-27 -# ============================================================================= -""" -Configuration file for 'Standard Very Loose Ks' using StdAllNoPIDsPions, i.e. no pT cut on LL pi daughters. Other cuts tighter vs. StdLooseKs. -""" -__author__ = "Susan Haines" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" -# ============================================================================= -__all__ = ( - 'StdVeryLooseKsLL' , - 'StdVeryLooseKsDD' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from Configurables import CombineParticles -from CommonParticles.Utils import * - -## ============================================================================ -## create the algorithm -StdVeryLooseKsLL = CombineParticles ( 'StdVeryLooseKsLL' ) - -StdVeryLooseKsLL.Inputs = [ "Phys/StdAllNoPIDsPions/Particles" ] -StdVeryLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" - -StdVeryLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (P < 100.*GeV) & (BPVIPCHI2() > 9.)" } -StdVeryLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 35.*MeV) & (AMINDOCA('LoKi::TrgDistanceCalculator')<1.5)" -StdVeryLooseKsLL.MotherCut = "(ADMASS('KS0') < 30.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.) " - -## configure Data-On-Demand service -locations = updateDoD ( StdVeryLooseKsLL ) - -## ============================================================================ -# configuration file for 'Standard Very Loose Downstream ' -# @author Susan Haines -# @date 2011-08-27 -# ============================================================================= -StdVeryLooseKsDD = CombineParticles ( 'StdVeryLooseKsDD' ) - -StdVeryLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ] -StdVeryLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" - -StdVeryLooseKsDD.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (P < 100.*GeV) & (BPVIPCHI2() > 6.25) & ((-PIDK) > 0.)" } -StdVeryLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (AMINDOCA('LoKi::TrgDistanceCalculator')<22.)" -StdVeryLooseKsDD.MotherCut = "(ADMASS('KS0') < 42.*MeV) & (VFASPF(VCHI2/VDOF) < 16.) & (BPVVDCHI2 > 4.)" - -## configure Data-On-Demand service -locations.update( updateDoD ( StdVeryLooseKsDD )) - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/tests/test_inputlocations_consistency.py b/Phys/CommonParticles/tests/test_inputlocations_consistency.py index 74b16ede6..1b6efffce 100755 --- a/Phys/CommonParticles/tests/test_inputlocations_consistency.py +++ b/Phys/CommonParticles/tests/test_inputlocations_consistency.py @@ -20,6 +20,7 @@ errors = {} message = "" for alg in algs : + if not hasattr(alg, 'Inputs') : continue locs = alg.Inputs for loc in locs : if not loc in outputLocations : -- GitLab From a0b6dfa0207b6df0d41d0f90974b13b4bb5fd247 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:06:20 +0100 Subject: [PATCH 15/50] v6r2p3 --- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 3 + .../python/CommonParticles/StandardTau.py | 2 + .../CommonParticles/StdLooseDetachedTau.py | 26 ++++---- .../StdLooseDetachedTauNonPhys.py | 61 +++++++++++++++++++ 6 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 65c140ead..faefc55a5 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r10 +version v8r10p1 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 0192da05c..e9608af0a 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r10 +v8r10p1 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index b9c4961e0..d9de9742c 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,9 @@ ! !----------------------------------------------------------------------------- +! 2012-12-21 - Anton Poluektov + - Branch of v8r10 with modified StdLooseDetachedTau*. + !========================= CommonParticles v8r10 2012-09-01 ========================= ! 2012-09-01 - Anton Poluektov diff --git a/Phys/CommonParticles/python/CommonParticles/StandardTau.py b/Phys/CommonParticles/python/CommonParticles/StandardTau.py index d78775211..f95014c31 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardTau.py @@ -19,6 +19,8 @@ _locations = {} from CommonParticles.StdLooseDetachedTau import * _locations.update ( locations ) +from CommonParticles.StdLooseDetachedTauNonPhys import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 3b2e81963..7b2f57f51 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseDetachedTau.py,v 1.0 2012-08-07 14:44:42 elsasser Exp $ +# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' # @author Donal Hill, Conor Fitzpatrick, Christian Elsasser -# @date 2012-08-07 +# @date 2012-12-02 # ============================================================================= """ Configuration file for 'Standard Loose Detached Tau' @@ -16,6 +16,7 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 __all__ = ( 'StdLooseDetachedTau3pi', 'locations' + ) # ============================================================================= from Gaudi.Configuration import * @@ -23,28 +24,29 @@ from Configurables import CombineParticles from CommonParticles.Utils import * ## ============================================================================ -## create the algorithm +## create the algorithm - physical tau+ -> pi+ pi- pi+ StdLooseDetachedTau3pi = CombineParticles ( 'StdLooseDetachedTau3pi' ) -StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLooseDetachedDipion/Particles", - "Phys/StdLoosePions/Particles" ] -StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> rho(770)0 pi+]cc", - "[tau+ -> rho(770)+ pi-]cc"] +StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] + +#Build physical tau and tau+++ +StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "rho(770)0" : "ALL", - "rho(770)+" : "ALL", - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", + "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + } #Need an upper mass window of 100 MeV for background estimation #and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<1800.*MeV)) & (ADOCAMAX('')<0.15*mm)" -StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 1800.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" +StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" +StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDetachedTau3pi ) + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py new file mode 100644 index 000000000..80591705f --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDetachedTau.py +# configuration file for 'Standard Loose Detached Tau' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 +# ============================================================================= +""" +Configuration file for 'Standard Loose Detached Tau Non Physical Tau' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= +__all__ = ( + 'StdLooseDetachedTau3piNonPhys', + 'locations' + + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm - non-physical tau+++ -> pi+ pi+ pi+ +StdLooseDetachedTau3piNonPhys = CombineParticles ( 'StdLooseDetachedTau3piNonPhys' ) + + +StdLooseDetachedTau3piNonPhys.Inputs = [ "Phys/StdLoosePions/Particles" ] + +#Build physical tau and tau+++ +StdLooseDetachedTau3piNonPhys.DecayDescriptors = ["[tau+ -> pi+ pi+ pi+]cc"] +StdLooseDetachedTau3piNonPhys.DaughtersCuts = { + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + } + +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds + +StdLooseDetachedTau3piNonPhys.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" +StdLooseDetachedTau3piNonPhys.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" + + + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseDetachedTau3piNonPhys ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From a8f5c44a09703195b7d05e2fbf10c1815d4baaa1 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:06:34 +0100 Subject: [PATCH 16/50] v6r2p4 --- Phys/CommonParticles/CMakeLists.txt | 12 +++++ Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 52 ++++++++++++++---- .../python/CommonParticles/StandardMuons.py | 3 ++ .../python/CommonParticles/StandardTau.py | 2 - .../CommonParticles/StandardTauNonPhys.py | 40 ++++++++++++++ .../StdAllLooseGammaConversion.py | 20 ++++--- .../StdAllTightGammaConversion.py | 20 ++++--- .../StdLooseDetachedDiElectron.py | 2 +- .../CommonParticles/StdLooseDiElectron.py | 4 +- .../CommonParticles/StdLooseDownMuons.py | 54 +++++++++++++++++++ .../python/CommonParticles/StdV0FromBrunel.py | 9 ++-- 13 files changed, 187 insertions(+), 35 deletions(-) create mode 100644 Phys/CommonParticles/CMakeLists.txt create mode 100644 Phys/CommonParticles/python/CommonParticles/StandardTauNonPhys.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt new file mode 100644 index 000000000..8e5853fc8 --- /dev/null +++ b/Phys/CommonParticles/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################################################ +# Package: CommonParticles +################################################################################ +gaudi_subdir(CommonParticles v8r13) + +gaudi_depends_on_subdirs(Phys/DaVinciKernel + Tr/TrackTools) + +gaudi_install_python_modules() + + +gaudi_add_test(QMTest QMTEST) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index faefc55a5..acf4aabb7 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r10p1 +version v8r13 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index e9608af0a..2735b1c92 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r10p1 +v8r13 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index d9de9742c..598ea5a8f 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,26 +8,53 @@ ! !----------------------------------------------------------------------------- -! 2012-12-21 - Anton Poluektov - - Branch of v8r10 with modified StdLooseDetachedTau*. +!========================= CommonParticles v8r13 2013-04-05 ========================= + +! 2013-03-29 - Jibo He + - Removed mass cut in StdLooseDetachedDiElectron + +! 2013-03-28 - Thomas Blake + - Added StdLooseDownMuons + +! 2013-03-27 - Vanya Belyaev + + - fixed StdV0FromBrunel + (thanks to Philippe Ghez) + +!========================= CommonParticles v8r12 2012-12-20 ========================= + +! 2012-12-04 - Donal Hill + - Changes to common particles StdLooseDetachedTauNonPhys.py and StdLooseDetachedTau.py + +!========================= CommonParticles v8r11 2012-11-30 ========================= + +! 2012-11-29 - Marco Clemencic + - Added CMake configuration file. + +! 2012-11-09 - Chris Jones + - Fix some bugs in the last commit for diElectron vertexing + + Proper use of the addTool method + + Add some missing imports + +! 2012-11-07 - Olivier Deschamps for Edwige Tournefier + - improve diElectron vertexing for DD configuration (new settings comes with + updated DiElectronMaker) !========================= CommonParticles v8r10 2012-09-01 ========================= ! 2012-09-01 - Anton Poluektov - - fix test_inputlocations_consistency + - fix test_inputlocations_consistency ! 2012-08-30 - Olivier Deschamps - - fix typo in StdVeryLooseAllPhotons name + - fix typo in StdVeryLooseAllPhotons name ! 2012-08-24 - Susan Haines -- Removed StdVeryLooseKs.py -- Removed lines related to StdVeryLooseKs from StandardV0.py + - Removed StdVeryLooseKs.py + - Removed lines related to StdVeryLooseKs from StandardV0.py ! 2012-08-23 - Thomas Blake - Added StandardTau and StandardDipion to StandardIntermediate - - !========================= CommonParticles v8r9 2012-06-28 ========================= ! 2012-05-23 - Olivier Deschamps @@ -38,13 +65,16 @@ called `StdDiElectronFromTracks' ! 2012-06-12 - Olivier Deschamps for Edwige Tournefier - - add StdAllTightSymGammaConversion.py : combinatorial gamma->ee from symmetrized e pT + - add StdAllTightSymGammaConversion.py : combinatorial gamma->ee from + symmetrized e pT ! 2012-06-12 - Olivier Deschamps - - StdAllLoose(Tight)GammaConversion.py : produce gamma->ee particle (based on DiElectronMaker) + - StdAllLoose(Tight)GammaConversion.py : produce gamma->ee particle + (based on DiElectronMaker) ! 2012-05-14 - Olivier Deschamps - - StdVeryLooseAllPhotons.py: photons with pT threshold down to 100 MeV (for new BremStrahlung recovery) + - StdVeryLooseAllPhotons.py: photons with pT threshold down to 100 MeV + (for new BremStrahlung recovery) ! 2012-06-8 - P. Koppenburg - New StdKsFromV0 that make Ks particles from the V0 Brunel objects. diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py index b2c7fad7a..a3a602d2d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py @@ -46,6 +46,9 @@ _locations.update ( locations ) from CommonParticles.StdTightANNUpMuons import * _locations.update ( locations ) +from CommonParticles.StdLooseDownMuons import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardTau.py b/Phys/CommonParticles/python/CommonParticles/StandardTau.py index f95014c31..d78775211 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardTau.py @@ -19,8 +19,6 @@ _locations = {} from CommonParticles.StdLooseDetachedTau import * _locations.update ( locations ) -from CommonParticles.StdLooseDetachedTauNonPhys import * -_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardTauNonPhys.py b/Phys/CommonParticles/python/CommonParticles/StandardTauNonPhys.py new file mode 100644 index 000000000..e543e657c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardTauNonPhys.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardTau.py,v1.0 2012-08-07 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StandardTau.py +# configuration file for 'Standard Tau' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 +# ============================================================================= +""" +Configuration file for 'Standard Tau Non Physical Tau' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdLooseDetachedTauNonPhys import * +_locations.update ( locations ) + + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py index f62a8e508..ed2c4faa5 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py @@ -22,14 +22,14 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * - +from Configurables import ( DiElectronMaker, ProtoParticleCALOFilter, + OfflineVertexFitter, ParticleTransporter ) ###--- Long pair -from Configurables import DiElectronMaker,ProtoParticleCALOFilter dieLL = DiElectronMaker('StdAllLooseGammaLL') dieLL.DecayDescriptor = "gamma -> e+ e-" selector = trackSelector ( dieLL , trackTypes = [ "Long"]) -dieLL.addTool( ProtoParticleCALOFilter('Electron')) +dieLL.addTool( ProtoParticleCALOFilter, name='Electron' ) dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] dieLL.DeltaY = 3. dieLL.DeltaYmax = 200 * mm @@ -42,17 +42,25 @@ StdAllLooseGammaLL=dieLL dieDD = DiElectronMaker('StdAllLooseGammaDD') dieDD.DecayDescriptor = "gamma -> e+ e-" selector = trackSelector ( dieDD , trackTypes = [ "Downstream"]) -dieDD.addTool( ProtoParticleCALOFilter('Electron')) +dieDD.addTool( ProtoParticleCALOFilter, name='Electron' ) dieDD.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] dieDD.DeltaY = 3. dieDD.DeltaYmax = 200 * mm dieDD.DiElectronMassMax = 100.*MeV dieDD.DiElectronPtMin = 200.*MeV +#-- improved vertex fitter settings +dieDD.UseCombinePair = True +dieDD.addTool( ParticleTransporter, name='TransporterDie' ) +dieDD.TransporterDie.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieDD.ParticleCombiners.update( { "" : "OfflineVertexFitter"} ) +dieDD.addTool( OfflineVertexFitter ) +dieDD.OfflineVertexFitter.addTool( ParticleTransporter, name='Transporter' ) +dieDD.OfflineVertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieDD.OfflineVertexFitter.maxDeltaZ = 100 * mm + locations.update( updateDoD ( dieDD )) StdAllLooseGammaDD=dieDD - - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py index a8050b41d..21a9b2809 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py @@ -22,14 +22,14 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * - +from Configurables import ( DiElectronMaker, ProtoParticleCALOFilter, + OfflineVertexFitter, ParticleTransporter ) ###--- Long pair -from Configurables import DiElectronMaker,ProtoParticleCALOFilter dieLL = DiElectronMaker('StdAllTightGammaLL') dieLL.DecayDescriptor = "gamma -> e+ e-" selector = trackSelector ( dieLL , trackTypes = [ "Long"]) -dieLL.addTool( ProtoParticleCALOFilter('Electron')) +dieLL.addTool( ProtoParticleCALOFilter, name='Electron' ) dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] dieLL.DeltaY = 3. dieLL.DeltaYmax = 200 * mm @@ -42,17 +42,25 @@ StdAllTightGammaLL=dieLL dieDD = DiElectronMaker('StdAllTightGammaDD') dieDD.DecayDescriptor = "gamma -> e+ e-" selector = trackSelector ( dieDD , trackTypes = [ "Downstream"]) -dieDD.addTool( ProtoParticleCALOFilter('Electron')) +dieDD.addTool( ProtoParticleCALOFilter, name='Electron' ) dieDD.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] dieDD.DeltaY = 3. dieDD.DeltaYmax = 200 * mm dieDD.DiElectronMassMax = 100.*MeV dieDD.DiElectronPtMin = 200.*MeV +#-- improved vertex fitter settings +dieDD.UseCombinePair = True +dieDD.addTool( ParticleTransporter, name='TransporterDie' ) +dieDD.TransporterDie.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieDD.ParticleCombiners.update( { "" : "OfflineVertexFitter"} ) +dieDD.addTool( OfflineVertexFitter ) +dieDD.OfflineVertexFitter.addTool( ParticleTransporter, name='Transporter' ) +dieDD.OfflineVertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieDD.OfflineVertexFitter.maxDeltaZ = 100 * mm + locations.update( updateDoD ( dieDD ) ) StdAllTightGammaDD=dieDD - - ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py index a621a2783..0cf063a33 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py @@ -19,7 +19,7 @@ StdLooseDetachedDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseDetachedDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] StdLooseDetachedDiElectron.DaughtersCuts = { "e+" : "(PT>200*MeV) & (MIPCHI2DV(PRIMARY)>1.)" } StdLooseDetachedDiElectron.CombinationCut = "(ADOCACHI2CUT(30,''))" -StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25) & (MM>20*MeV)" +StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDetachedDiElectron) ## ============================================================================ diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index 63bba307e..46087f42a 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -34,7 +34,7 @@ from GaudiKernel.SystemOfUnits import * dieLL = DiElectronMaker('StdDiElectronFromTracks') dieLL.Particle = "J/psi(1S)" selector = trackSelector ( dieLL , trackTypes = [ "Long"]) -dieLL.addTool( ProtoParticleCALOFilter('Electron')) +dieLL.addTool( ProtoParticleCALOFilter, name='Electron' ) dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] dieLL.DiElectronMassMax = 5000.*MeV dieLL.DiElectronMassMin = 0.*MeV @@ -49,5 +49,3 @@ if '__main__' == __name__ : print __author__ print __version__ print locationsDoD ( locations ) - - diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py new file mode 100644 index 000000000..6107dd6c2 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseMuons.py +# configuration file for 'Standard Loose Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +# ============================================================================= +__all__ = ( + 'StdLooseDownMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseDownMuons', + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = ['Downstream'] ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseDownMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py index 6110491ae..3c19fb0af 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py +++ b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py @@ -34,9 +34,10 @@ V0Maker = V0FromDstMaker() dod = DataOnDemandSvc() for v0 in v0locations: - p = { hat + v0 + '/Particles' : V0Maker.getFullName() } - dod.AlgMap.update( p ) - locations.update ( p ) + p1 = { hat + v0 + '/Particles' : V0Maker.getFullName() } + p2 = { hat + v0 + '/Particles' : V0Maker } + dod.AlgMap.update( p1 ) + locations.update ( p2 ) ## ============================================================================ if '__main__' == __name__ : @@ -44,7 +45,7 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locations + print locationsDoD ( locations ) # ============================================================================= # The END -- GitLab From 973716326eae2cea5c5b8023737687e8f2d93c04 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:08:17 +0100 Subject: [PATCH 17/50] v6r2p9 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 6 ++++++ .../python/CommonParticles/StdAllLooseANNElectrons.py | 2 +- .../python/CommonParticles/StdAllLooseANNKaons.py | 2 +- .../python/CommonParticles/StdAllLooseANNPions.py | 2 +- .../python/CommonParticles/StdAllLooseANNProtons.py | 2 +- .../python/CommonParticles/StdLooseANNDownElectrons.py | 2 +- .../python/CommonParticles/StdLooseANNDownKaons.py | 2 +- .../python/CommonParticles/StdLooseANNDownPions.py | 2 +- .../python/CommonParticles/StdLooseANNDownProtons.py | 2 +- .../python/CommonParticles/StdLooseANNUpElectrons.py | 2 +- .../python/CommonParticles/StdLooseANNUpKaons.py | 2 +- .../python/CommonParticles/StdLooseANNUpPions.py | 2 +- .../python/CommonParticles/StdLooseANNUpProtons.py | 2 +- .../python/CommonParticles/StdTightANNDownElectrons.py | 2 +- .../python/CommonParticles/StdTightANNDownKaons.py | 2 +- .../python/CommonParticles/StdTightANNDownPions.py | 2 +- .../python/CommonParticles/StdTightANNDownProtons.py | 2 +- .../python/CommonParticles/StdTightANNElectrons.py | 2 +- .../python/CommonParticles/StdTightANNMuons.py | 2 +- .../python/CommonParticles/StdTightANNPions.py | 2 +- .../python/CommonParticles/StdTightANNProtons.py | 2 +- .../python/CommonParticles/StdTightANNUpElectrons.py | 2 +- .../python/CommonParticles/StdTightANNUpKaons.py | 2 +- .../python/CommonParticles/StdTightANNUpPions.py | 2 +- .../python/CommonParticles/StdTightANNUpProtons.py | 2 +- 28 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 8e5853fc8..050fe823e 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r13) +gaudi_subdir(CommonParticles v8r14) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index acf4aabb7..a5da8955a 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r13 +version v8r14 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 2735b1c92..e8c97ded3 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r13 +v8r14 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 598ea5a8f..9e806d41c 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,12 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r14 2013-07-05 ========================= + +! 2013-07-04 - Chris Jones + - Update ANNPID Stable Common Particles with new cut values tuned for the + latest "MC12TuneV2" tuning. + !========================= CommonParticles v8r13 2013-04-05 ========================= ! 2013-03-29 - Jibo He diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py index a8d9a6972..74a015fd9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py @@ -32,7 +32,7 @@ selector = trackSelector ( algorithm ) fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.09'" ] #fltr.Selection = [ "ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.25'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py index eb6dd4b94..d5a2d020f 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py @@ -30,7 +30,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] -fltr.Selection = [ "ProbNNk>'0.025'" ] +fltr.Selection = [ "ProbNNk>'0.02'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py index 8d3320a89..9ad5eb1a0 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py @@ -31,7 +31,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.05'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py index 39aa8850e..01e00e8e4 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py @@ -31,7 +31,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.05'" ] -fltr.Selection = [ "ProbNNp>'0.0125'" ] +fltr.Selection = [ "ProbNNp>'0.01'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py index 3b31aaf64..f52602282 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.035'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py index f01cdf744..17e2151dc 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] -fltr.Selection = [ "ProbNNk>'0.075'" ] +fltr.Selection = [ "ProbNNk>'0.05'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py index e2aa519bf..369a523e9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py index 42a765359..812ec6b50 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] -fltr.Selection = [ "ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.04'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py index f8217582c..acd133578 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py index 9d4cc93e3..5cdacdeb8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.1'" ] -fltr.Selection = [ "ProbNNk>'0.1'" ] +fltr.Selection = [ "ProbNNk>'0.025'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py index 9c3e5fb58..da9e2c830 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py index 8c2bb3950..fe2c64b9c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] -fltr.Selection = [ "ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py index 3a2072a74..3e55ccc3a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.07'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py index 36bac0965..10b4c514a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] -fltr.Selection = [ "ProbNNk>'0.2'" ] +fltr.Selection = [ "ProbNNk>'0.15'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py index a05b8f627..e4da68463 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] -fltr.Selection = [ "ProbNNpi>'0.2'" ] +fltr.Selection = [ "ProbNNpi>'0.07'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py index f14a41794..73e43b749 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] -fltr.Selection = [ "ProbNNp>'0.2'" ] +fltr.Selection = [ "ProbNNp>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py index ea48691cb..92bff470d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py @@ -34,7 +34,7 @@ selector = trackSelector ( algorithm ) fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] #fltr.Selection = [ "ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.35'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.16'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py index de8326e3a..28736d215 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py @@ -34,7 +34,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) #fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ] -fltr.Selection = [ "ProbNNmu>'0.1'" ] +fltr.Selection = [ "ProbNNmu>'0.01'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py index 1d41a180e..55c12b6e3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py @@ -30,7 +30,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) -fltr.Selection = [ "ProbNNpi>'0.55'" ] +fltr.Selection = [ "ProbNNpi>'0.6'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py index 85a279799..45b55c570 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.125'" ] -fltr.Selection = [ "ProbNNp>'0.021'" ] +fltr.Selection = [ "ProbNNp>'0.02'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py index 161ec60cb..9a6032a06 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py index b6ac65a34..4d55a42b9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] -fltr.Selection = [ "ProbNNk>'0.2'" ] +fltr.Selection = [ "ProbNNk>'0.09'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py index 6e058e832..e2463ac9b 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] -fltr.Selection = [ "ProbNNpi>'0.2'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py index f91068af7..0c6345a21 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] -fltr.Selection = [ "ProbNNp>'0.2'" ] +fltr.Selection = [ "ProbNNp>'0.075'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) -- GitLab From 2560b18e6e132b8922fb1313e034842490f0a40a Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:08:33 +0100 Subject: [PATCH 18/50] v6r2p10 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 5 +++++ .../python/CommonParticles/StdMassConstrainedJpsi2MuMu.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 050fe823e..86eed804e 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r14) +gaudi_subdir(CommonParticles v8r15) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index a5da8955a..60c4c9b5c 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r14 +version v8r15 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index e8c97ded3..8c97f72d4 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r14 +v8r15 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 9e806d41c..17a98c3ea 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,11 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r15 2013-09-18 ========================= + +! 2013-08-23 - Roel Aaij + - Widen the mass window to 150 MeV in StdMassConstrainedJpsi. + !========================= CommonParticles v8r14 2013-07-05 ========================= ! 2013-07-04 - Chris Jones diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 92e312d26..880cde9ad 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -27,7 +27,7 @@ StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : '(PIDmu > 0) & (PT > 0.5*GeV)' } -StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & (ADOCACHI2CUT(20, ''))" +StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 150.*MeV) & (ADOCACHI2CUT(20, ''))" StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" ## configure Data-On-Demand service -- GitLab From 3b3839b553283bfefa709eca2e15c78fe5924972 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:08:49 +0100 Subject: [PATCH 19/50] v6r2p11 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 24 ++++++++++ .../python/CommonParticles/StandardBasic.py | 3 ++ .../python/CommonParticles/StandardJets.py | 41 +++++++++++++++++ .../python/CommonParticles/StdJets.py | 43 ++++++++++++++++++ .../CommonParticles/StdLooseDetachedTau.py | 13 +++--- .../python/CommonParticles/StdLooseRho0.py | 2 +- .../python/CommonParticles/StdParticleFlow.py | 45 +++++++++++++++++++ 10 files changed, 166 insertions(+), 11 deletions(-) create mode 100644 Phys/CommonParticles/python/CommonParticles/StandardJets.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdJets.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 86eed804e..c974b520b 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r15) +gaudi_subdir(CommonParticles v8r18) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 60c4c9b5c..bb7630d4a 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r15 +version v8r18 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 8c97f72d4..98a91fd6d 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r15 +v8r18 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 17a98c3ea..ee733ce4e 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,30 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r18 2014-01-22 ========================= + +! 2014-01-19 - Giampiero Mancinelli +- Heavily changed StdLooseDetachedTau list for B->tautau, B->taumu in StdLooseDetachedTau.py + +!========================= CommonParticles v8r17 2013-12-18 ========================= + + +! 2013-12-17 - Cédric Potterat + - remove a "print" in StdParticleFlow + +! 2013-12-10 - Cédric Potterat + - Adding: + . StdJets.py + . StdParticleFlow.py + . StandardJets.py + - Modifying: + . StandardBasic.py (Adding StandardJets.py) + +!========================= CommonParticles v8r16 2013-10-29 ========================= + +! 2013-10-25 - Chris Jones + - Remove CC in StdLooseRho0 + !========================= CommonParticles v8r15 2013-09-18 ========================= ! 2013-08-23 - Roel Aaij diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py index bd384b092..be9a2eb98 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py @@ -22,6 +22,9 @@ _locations.update ( locations ) from CommonParticles.StandardBasicNeutral import * _locations.update ( locations ) +from CommonParticles.StandardJets import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardJets.py b/Phys/CommonParticles/python/CommonParticles/StandardJets.py new file mode 100644 index 000000000..5a02e89a4 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardJets.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardBasic.py,v 1.4 2009-10-09 12:41:27 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardBasic.py +# configuration file for 'Standard Basic' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Basic' particles +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdParticleFlow import * +_locations.update ( locations ) + +from CommonParticles.StdJets import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdJets.py b/Phys/CommonParticles/python/CommonParticles/StdJets.py new file mode 100644 index 000000000..252739118 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdJets.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdJets' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * + +from JetAccessories.JetMaker_Config import JetMakerConf +algorithm = JetMakerConf("StdJets").algorithms[0] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdJets = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 7b2f57f51..424097d56 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -4,8 +4,9 @@ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' -# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli # @date 2012-12-02 +# Strongly modified 2012-14-01 by Giampiero Mancinelli # ============================================================================= """ Configuration file for 'Standard Loose Detached Tau' @@ -32,16 +33,14 @@ StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", - "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)", + "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)" } -#Need an upper mass window of 100 MeV for background estimation -#and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" -StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" +StdLooseDetachedTau3pi.CombinationCut = "(APT>800.*MeV) & ((AM>400.*MeV) & (AM<2100.*MeV)) & (AMAXDOCA('')<0.2*mm) & (ANUM(PT > 800*MeV) >= 1) " +StdLooseDetachedTau3pi.MotherCut = "(PT>1000.*MeV) & (M>500.*MeV) & (M<2000.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 16) & (BPVVDCHI2>16) & (BPVVDRHO>0.1*mm) & (BPVVDRHO<7.0*mm) & (BPVVDZ>5.0*mm)" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDetachedTau3pi ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py index 3452fa725..a052e1640 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -27,7 +27,7 @@ from CommonParticles.Utils import * StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) StdLooseRho0.Inputs = [ "Phys/StdLoosePions/Particles" ] -StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" +StdLooseRho0.DecayDescriptor = "rho(770)0 -> pi+ pi-" StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)& (ADOCACHI2CUT(15, ''))" StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py b/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py new file mode 100644 index 000000000..ca29c813c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdParticleFlow' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * + + +from JetAccessories.ParticleFlow_Config import ParticleFlowConf +algorithm = ParticleFlowConf("PF" , _MCCor = False ).PFSeq + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + + +## finally: define the symbol +StdParticleFlow = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From daecb23c1f2e695194ca6d3a25d83f86d89b5da8 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:09:18 +0100 Subject: [PATCH 20/50] v6r3 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 65 ++----------------- .../python/CommonParticles/StandardBasic.py | 3 - .../python/CommonParticles/StandardJets.py | 41 ------------ .../python/CommonParticles/StandardMuons.py | 3 - .../StdAllLooseANNElectrons.py | 2 +- .../CommonParticles/StdAllLooseANNKaons.py | 2 +- .../CommonParticles/StdAllLooseANNPions.py | 2 +- .../CommonParticles/StdAllLooseANNProtons.py | 2 +- .../python/CommonParticles/StdJets.py | 43 ------------ .../StdLooseANNDownElectrons.py | 2 +- .../CommonParticles/StdLooseANNDownKaons.py | 2 +- .../CommonParticles/StdLooseANNDownPions.py | 2 +- .../CommonParticles/StdLooseANNDownProtons.py | 2 +- .../CommonParticles/StdLooseANNUpElectrons.py | 2 +- .../CommonParticles/StdLooseANNUpKaons.py | 2 +- .../CommonParticles/StdLooseANNUpPions.py | 2 +- .../CommonParticles/StdLooseANNUpProtons.py | 2 +- .../StdLooseDetachedDiElectron.py | 2 +- .../CommonParticles/StdLooseDetachedTau.py | 23 +++---- .../StdLooseDetachedTauNonPhys.py | 10 +-- .../CommonParticles/StdLooseDownMuons.py | 54 --------------- .../python/CommonParticles/StdLooseRho0.py | 2 +- .../StdMassConstrainedJpsi2MuMu.py | 2 +- .../python/CommonParticles/StdParticleFlow.py | 45 ------------- .../StdTightANNDownElectrons.py | 2 +- .../CommonParticles/StdTightANNDownKaons.py | 2 +- .../CommonParticles/StdTightANNDownPions.py | 2 +- .../CommonParticles/StdTightANNDownProtons.py | 2 +- .../CommonParticles/StdTightANNElectrons.py | 2 +- .../CommonParticles/StdTightANNMuons.py | 2 +- .../CommonParticles/StdTightANNPions.py | 2 +- .../CommonParticles/StdTightANNProtons.py | 2 +- .../CommonParticles/StdTightANNUpElectrons.py | 2 +- .../CommonParticles/StdTightANNUpKaons.py | 2 +- .../CommonParticles/StdTightANNUpPions.py | 2 +- .../CommonParticles/StdTightANNUpProtons.py | 2 +- .../python/CommonParticles/StdV0FromBrunel.py | 9 ++- 40 files changed, 58 insertions(+), 298 deletions(-) delete mode 100644 Phys/CommonParticles/python/CommonParticles/StandardJets.py delete mode 100644 Phys/CommonParticles/python/CommonParticles/StdJets.py delete mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py delete mode 100644 Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index c974b520b..8db6f0e87 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r18) +gaudi_subdir(CommonParticles v8r11) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index bb7630d4a..1da64a37c 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r18 +version v8r11 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 98a91fd6d..98a496cc7 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r18 +v8r11 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index ee733ce4e..8362a102b 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,59 +8,6 @@ ! !----------------------------------------------------------------------------- -!========================= CommonParticles v8r18 2014-01-22 ========================= - -! 2014-01-19 - Giampiero Mancinelli -- Heavily changed StdLooseDetachedTau list for B->tautau, B->taumu in StdLooseDetachedTau.py - -!========================= CommonParticles v8r17 2013-12-18 ========================= - - -! 2013-12-17 - Cédric Potterat - - remove a "print" in StdParticleFlow - -! 2013-12-10 - Cédric Potterat - - Adding: - . StdJets.py - . StdParticleFlow.py - . StandardJets.py - - Modifying: - . StandardBasic.py (Adding StandardJets.py) - -!========================= CommonParticles v8r16 2013-10-29 ========================= - -! 2013-10-25 - Chris Jones - - Remove CC in StdLooseRho0 - -!========================= CommonParticles v8r15 2013-09-18 ========================= - -! 2013-08-23 - Roel Aaij - - Widen the mass window to 150 MeV in StdMassConstrainedJpsi. - -!========================= CommonParticles v8r14 2013-07-05 ========================= - -! 2013-07-04 - Chris Jones - - Update ANNPID Stable Common Particles with new cut values tuned for the - latest "MC12TuneV2" tuning. - -!========================= CommonParticles v8r13 2013-04-05 ========================= - -! 2013-03-29 - Jibo He - - Removed mass cut in StdLooseDetachedDiElectron - -! 2013-03-28 - Thomas Blake - - Added StdLooseDownMuons - -! 2013-03-27 - Vanya Belyaev - - - fixed StdV0FromBrunel - (thanks to Philippe Ghez) - -!========================= CommonParticles v8r12 2012-12-20 ========================= - -! 2012-12-04 - Donal Hill - - Changes to common particles StdLooseDetachedTauNonPhys.py and StdLooseDetachedTau.py - !========================= CommonParticles v8r11 2012-11-30 ========================= ! 2012-11-29 - Marco Clemencic @@ -72,20 +19,20 @@ + Add some missing imports ! 2012-11-07 - Olivier Deschamps for Edwige Tournefier - - improve diElectron vertexing for DD configuration (new settings comes with - updated DiElectronMaker) + - improve diElectron vertexing for DD configuration (new settings comes with + updated DiElectronMaker) !========================= CommonParticles v8r10 2012-09-01 ========================= ! 2012-09-01 - Anton Poluektov - - fix test_inputlocations_consistency + - fix test_inputlocations_consistency ! 2012-08-30 - Olivier Deschamps - - fix typo in StdVeryLooseAllPhotons name + - fix typo in StdVeryLooseAllPhotons name ! 2012-08-24 - Susan Haines - - Removed StdVeryLooseKs.py - - Removed lines related to StdVeryLooseKs from StandardV0.py +- Removed StdVeryLooseKs.py +- Removed lines related to StdVeryLooseKs from StandardV0.py ! 2012-08-23 - Thomas Blake - Added StandardTau and StandardDipion to StandardIntermediate diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py index be9a2eb98..bd384b092 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py @@ -22,9 +22,6 @@ _locations.update ( locations ) from CommonParticles.StandardBasicNeutral import * _locations.update ( locations ) -from CommonParticles.StandardJets import * -_locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardJets.py b/Phys/CommonParticles/python/CommonParticles/StandardJets.py deleted file mode 100644 index 5a02e89a4..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StandardJets.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python -# ============================================================================= -# $Id: StandardBasic.py,v 1.4 2009-10-09 12:41:27 pkoppenb Exp $ -# ============================================================================= -## @file CommonParticles/StandardBasic.py -# configuration file for 'Standard Basic' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 -# ============================================================================= -""" -Configuration file for 'Standard Basic' particles -""" -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" -# ============================================================================= - -_locations = {} - -from CommonParticles.StdParticleFlow import * -_locations.update ( locations ) - -from CommonParticles.StdJets import * -_locations.update ( locations ) - -# redefine the locations -locations = _locations - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - from CommonParticles.Utils import locationsDoD - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= - - diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py index a3a602d2d..b2c7fad7a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py @@ -46,9 +46,6 @@ _locations.update ( locations ) from CommonParticles.StdTightANNUpMuons import * _locations.update ( locations ) -from CommonParticles.StdLooseDownMuons import * -_locations.update ( locations ) - # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py index 74a015fd9..a8d9a6972 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py @@ -32,7 +32,7 @@ selector = trackSelector ( algorithm ) fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.09'" ] #fltr.Selection = [ "ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.03'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.25'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py index d5a2d020f..eb6dd4b94 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py @@ -30,7 +30,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] -fltr.Selection = [ "ProbNNk>'0.02'" ] +fltr.Selection = [ "ProbNNk>'0.025'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py index 9ad5eb1a0..8d3320a89 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py @@ -31,7 +31,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.05'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py index 01e00e8e4..39aa8850e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py @@ -31,7 +31,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.05'" ] -fltr.Selection = [ "ProbNNp>'0.01'" ] +fltr.Selection = [ "ProbNNp>'0.0125'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdJets.py b/Phys/CommonParticles/python/CommonParticles/StdJets.py deleted file mode 100644 index 252739118..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdJets.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python -# ============================================================================= -# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= -## @file CommonParticles/StdAllNoPIDsPions.py -# configuration file for 'Standard NoPIDs Pions' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 -# ============================================================================= -""" -Configuration file for 'Standard NoPIDs Pions' -""" -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" -# ============================================================================= -__all__ = ( - 'StdJets' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from CommonParticles.Utils import * - -from JetAccessories.JetMaker_Config import JetMakerConf -algorithm = JetMakerConf("StdJets").algorithms[0] - -## configure Data-On-Demand service -locations = updateDoD ( algorithm ) - -## finally: define the symbol -StdJets = algorithm - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py index f52602282..3b31aaf64 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.035'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py index 17e2151dc..f01cdf744 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] -fltr.Selection = [ "ProbNNk>'0.05'" ] +fltr.Selection = [ "ProbNNk>'0.075'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py index 369a523e9..e2aa519bf 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.03'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py index 812ec6b50..42a765359 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] -fltr.Selection = [ "ProbNNp>'0.04'" ] +fltr.Selection = [ "ProbNNp>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py index acd133578..f8217582c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.03'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py index 5cdacdeb8..9d4cc93e3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.1'" ] -fltr.Selection = [ "ProbNNk>'0.025'" ] +fltr.Selection = [ "ProbNNk>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py index da9e2c830..9c3e5fb58 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.03'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py index fe2c64b9c..8c2bb3950 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] -fltr.Selection = [ "ProbNNp>'0.03'" ] +fltr.Selection = [ "ProbNNp>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py index 0cf063a33..a621a2783 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py @@ -19,7 +19,7 @@ StdLooseDetachedDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseDetachedDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] StdLooseDetachedDiElectron.DaughtersCuts = { "e+" : "(PT>200*MeV) & (MIPCHI2DV(PRIMARY)>1.)" } StdLooseDetachedDiElectron.CombinationCut = "(ADOCACHI2CUT(30,''))" -StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" +StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25) & (MM>20*MeV)" locations = updateDoD(StdLooseDetachedDiElectron) ## ============================================================================ diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 424097d56..4e083fd0c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -1,12 +1,11 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ +# $Id: StdLooseDetachedTau.py,v 1.0 2012-08-07 14:44:42 elsasser Exp $ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' -# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli -# @date 2012-12-02 -# Strongly modified 2012-14-01 by Giampiero Mancinelli +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @date 2012-08-07 # ============================================================================= """ Configuration file for 'Standard Loose Detached Tau' @@ -28,19 +27,21 @@ from CommonParticles.Utils import * ## create the algorithm - physical tau+ -> pi+ pi- pi+ StdLooseDetachedTau3pi = CombineParticles ( 'StdLooseDetachedTau3pi' ) -StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] +StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLooseDetachedDipion/Particles", + "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ -StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] +StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> rho(770)0 pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)", - "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)" - + "rho(770)0" : "ALL", + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3pi.CombinationCut = "(APT>800.*MeV) & ((AM>400.*MeV) & (AM<2100.*MeV)) & (AMAXDOCA('')<0.2*mm) & (ANUM(PT > 800*MeV) >= 1) " -StdLooseDetachedTau3pi.MotherCut = "(PT>1000.*MeV) & (M>500.*MeV) & (M<2000.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 16) & (BPVVDCHI2>16) & (BPVVDRHO>0.1*mm) & (BPVVDRHO<7.0*mm) & (BPVVDZ>5.0*mm)" +StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm)" +StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDetachedTau3pi ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py index 80591705f..1b3a02edc 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ +# $Id: StdLooseDetachedTau.py,v 1.0 2012-08-07 14:44:42 elsasser Exp $ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' @@ -28,18 +28,20 @@ from CommonParticles.Utils import * StdLooseDetachedTau3piNonPhys = CombineParticles ( 'StdLooseDetachedTau3piNonPhys' ) -StdLooseDetachedTau3piNonPhys.Inputs = [ "Phys/StdLoosePions/Particles" ] +StdLooseDetachedTau3piNonPhys.Inputs = [ "Phys/StdLooseDetachedDipion/Particles", + "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ -StdLooseDetachedTau3piNonPhys.DecayDescriptors = ["[tau+ -> pi+ pi+ pi+]cc"] +StdLooseDetachedTau3piNonPhys.DecayDescriptors = ["[tau+ -> rho(770)+ pi+]cc"] StdLooseDetachedTau3piNonPhys.DaughtersCuts = { + "rho(770)+" : "ALL", "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } #Need an upper mass window of 100 MeV for background estimation #and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3piNonPhys.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" +StdLooseDetachedTau3piNonPhys.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm)" StdLooseDetachedTau3piNonPhys.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py deleted file mode 100644 index 6107dd6c2..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python -# ============================================================================= -# $Id: StdLooseMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ -# ============================================================================= -## @file CommonParticles/StdLooseMuons.py -# configuration file for 'Standard Loose Muons' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 -# ============================================================================= -""" -Configuration file for 'Standard Loose Muons' -""" -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" -# ============================================================================= -__all__ = ( - 'StdLooseDownMuons' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from Configurables import CombinedParticleMaker -from Configurables import ProtoParticleMUONFilter -from CommonParticles.Utils import * - -## create the algorithm -algorithm = CombinedParticleMaker ( 'StdLooseDownMuons', - Particle = 'muon' ) - -# configure the track selector -selector = trackSelector ( algorithm, trackTypes = ['Downstream'] ) - -# protoparticle filter: -fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) -fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] - -## configure Data-On-Demand service -locations = updateDoD ( algorithm ) - -## finally: define the symbol -StdLooseDownMuons = algorithm - - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py index a052e1640..3452fa725 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -27,7 +27,7 @@ from CommonParticles.Utils import * StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) StdLooseRho0.Inputs = [ "Phys/StdLoosePions/Particles" ] -StdLooseRho0.DecayDescriptor = "rho(770)0 -> pi+ pi-" +StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)& (ADOCACHI2CUT(15, ''))" StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 880cde9ad..92e312d26 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -27,7 +27,7 @@ StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : '(PIDmu > 0) & (PT > 0.5*GeV)' } -StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 150.*MeV) & (ADOCACHI2CUT(20, ''))" +StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & (ADOCACHI2CUT(20, ''))" StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py b/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py deleted file mode 100644 index ca29c813c..000000000 --- a/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python -# ============================================================================= -# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ -# ============================================================================= -## @file CommonParticles/StdAllNoPIDsPions.py -# configuration file for 'Standard NoPIDs Pions' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 -# ============================================================================= -""" -Configuration file for 'Standard NoPIDs Pions' -""" -__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" -__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" -# ============================================================================= -__all__ = ( - 'StdParticleFlow' , - 'locations' - ) -# ============================================================================= -from Gaudi.Configuration import * -from CommonParticles.Utils import * - - -from JetAccessories.ParticleFlow_Config import ParticleFlowConf -algorithm = ParticleFlowConf("PF" , _MCCor = False ).PFSeq - -## configure Data-On-Demand service -locations = updateDoD ( algorithm ) - - -## finally: define the symbol -StdParticleFlow = algorithm - -## ============================================================================ -if '__main__' == __name__ : - - print __doc__ - print __author__ - print __version__ - print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py index 3e55ccc3a..3a2072a74 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.07'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py index 10b4c514a..36bac0965 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] -fltr.Selection = [ "ProbNNk>'0.15'" ] +fltr.Selection = [ "ProbNNk>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py index e4da68463..a05b8f627 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] -fltr.Selection = [ "ProbNNpi>'0.07'" ] +fltr.Selection = [ "ProbNNpi>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py index 73e43b749..f14a41794 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] -fltr.Selection = [ "ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py index 92bff470d..ea48691cb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py @@ -34,7 +34,7 @@ selector = trackSelector ( algorithm ) fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] #fltr.Selection = [ "ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.16'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.35'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py index 28736d215..de8326e3a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py @@ -34,7 +34,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) #fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ] -fltr.Selection = [ "ProbNNmu>'0.01'" ] +fltr.Selection = [ "ProbNNmu>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py index 55c12b6e3..1d41a180e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py @@ -30,7 +30,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) -fltr.Selection = [ "ProbNNpi>'0.6'" ] +fltr.Selection = [ "ProbNNpi>'0.55'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py index 45b55c570..85a279799 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.125'" ] -fltr.Selection = [ "ProbNNp>'0.02'" ] +fltr.Selection = [ "ProbNNp>'0.021'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py index 9a6032a06..161ec60cb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py index 4d55a42b9..b6ac65a34 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] -fltr.Selection = [ "ProbNNk>'0.09'" ] +fltr.Selection = [ "ProbNNk>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py index e2463ac9b..6e058e832 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py index 0c6345a21..f91068af7 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] -fltr.Selection = [ "ProbNNp>'0.075'" ] +fltr.Selection = [ "ProbNNp>'0.2'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py index 3c19fb0af..6110491ae 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py +++ b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py @@ -34,10 +34,9 @@ V0Maker = V0FromDstMaker() dod = DataOnDemandSvc() for v0 in v0locations: - p1 = { hat + v0 + '/Particles' : V0Maker.getFullName() } - p2 = { hat + v0 + '/Particles' : V0Maker } - dod.AlgMap.update( p1 ) - locations.update ( p2 ) + p = { hat + v0 + '/Particles' : V0Maker.getFullName() } + dod.AlgMap.update( p ) + locations.update ( p ) ## ============================================================================ if '__main__' == __name__ : @@ -45,7 +44,7 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locationsDoD ( locations ) + print locations # ============================================================================= # The END -- GitLab From 2fc8f8eee1787051267e4ccbe1ccb6bf54693803 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:09:32 +0100 Subject: [PATCH 21/50] v6r4 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 17 +++++++++++------ .../CommonParticles/StdLooseDetachedTau.py | 16 ++++++++-------- .../StdLooseDetachedTauNonPhys.py | 10 ++++------ 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 8db6f0e87..7f3cabcbd 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r11) +gaudi_subdir(CommonParticles v8r12) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 1da64a37c..c5ca90c6d 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r11 +version v8r12 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 98a496cc7..78af8a68f 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r11 +v8r12 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 8362a102b..0f205599f 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,11 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r12 2012-12-20 ========================= + +! 2012-12-04 - Donal Hill + - Changes to common particles StdLooseDetachedTauNonPhys.py and StdLooseDetachedTau.py + !========================= CommonParticles v8r11 2012-11-30 ========================= ! 2012-11-29 - Marco Clemencic @@ -19,20 +24,20 @@ + Add some missing imports ! 2012-11-07 - Olivier Deschamps for Edwige Tournefier - - improve diElectron vertexing for DD configuration (new settings comes with - updated DiElectronMaker) + - improve diElectron vertexing for DD configuration (new settings comes with + updated DiElectronMaker) !========================= CommonParticles v8r10 2012-09-01 ========================= ! 2012-09-01 - Anton Poluektov - - fix test_inputlocations_consistency + - fix test_inputlocations_consistency ! 2012-08-30 - Olivier Deschamps - - fix typo in StdVeryLooseAllPhotons name + - fix typo in StdVeryLooseAllPhotons name ! 2012-08-24 - Susan Haines -- Removed StdVeryLooseKs.py -- Removed lines related to StdVeryLooseKs from StandardV0.py + - Removed StdVeryLooseKs.py + - Removed lines related to StdVeryLooseKs from StandardV0.py ! 2012-08-23 - Thomas Blake - Added StandardTau and StandardDipion to StandardIntermediate diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 4e083fd0c..7b2f57f51 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseDetachedTau.py,v 1.0 2012-08-07 14:44:42 elsasser Exp $ +# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' # @author Donal Hill, Conor Fitzpatrick, Christian Elsasser -# @date 2012-08-07 +# @date 2012-12-02 # ============================================================================= """ Configuration file for 'Standard Loose Detached Tau' @@ -27,20 +27,20 @@ from CommonParticles.Utils import * ## create the algorithm - physical tau+ -> pi+ pi- pi+ StdLooseDetachedTau3pi = CombineParticles ( 'StdLooseDetachedTau3pi' ) -StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLooseDetachedDipion/Particles", - "Phys/StdLoosePions/Particles" ] +StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ -StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> rho(770)0 pi+]cc"] +StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "rho(770)0" : "ALL", - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", + "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + } #Need an upper mass window of 100 MeV for background estimation #and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm)" +StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" ## configure Data-On-Demand service diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py index 1b3a02edc..80591705f 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdLooseDetachedTau.py,v 1.0 2012-08-07 14:44:42 elsasser Exp $ +# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' @@ -28,20 +28,18 @@ from CommonParticles.Utils import * StdLooseDetachedTau3piNonPhys = CombineParticles ( 'StdLooseDetachedTau3piNonPhys' ) -StdLooseDetachedTau3piNonPhys.Inputs = [ "Phys/StdLooseDetachedDipion/Particles", - "Phys/StdLoosePions/Particles" ] +StdLooseDetachedTau3piNonPhys.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ -StdLooseDetachedTau3piNonPhys.DecayDescriptors = ["[tau+ -> rho(770)+ pi+]cc"] +StdLooseDetachedTau3piNonPhys.DecayDescriptors = ["[tau+ -> pi+ pi+ pi+]cc"] StdLooseDetachedTau3piNonPhys.DaughtersCuts = { - "rho(770)+" : "ALL", "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } #Need an upper mass window of 100 MeV for background estimation #and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3piNonPhys.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm)" +StdLooseDetachedTau3piNonPhys.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" StdLooseDetachedTau3piNonPhys.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" -- GitLab From bea38db4ab2985ed5b42771c3c4fcbcee15a5824 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:09:46 +0100 Subject: [PATCH 22/50] v6r5 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 13 +++++ .../python/CommonParticles/StandardMuons.py | 3 ++ .../StdLooseDetachedDiElectron.py | 2 +- .../CommonParticles/StdLooseDownMuons.py | 54 +++++++++++++++++++ .../python/CommonParticles/StdV0FromBrunel.py | 9 ++-- 8 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 7f3cabcbd..8e5853fc8 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r12) +gaudi_subdir(CommonParticles v8r13) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index c5ca90c6d..acf4aabb7 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r12 +version v8r13 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 78af8a68f..2735b1c92 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r12 +v8r13 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 0f205599f..598ea5a8f 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,19 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r13 2013-04-05 ========================= + +! 2013-03-29 - Jibo He + - Removed mass cut in StdLooseDetachedDiElectron + +! 2013-03-28 - Thomas Blake + - Added StdLooseDownMuons + +! 2013-03-27 - Vanya Belyaev + + - fixed StdV0FromBrunel + (thanks to Philippe Ghez) + !========================= CommonParticles v8r12 2012-12-20 ========================= ! 2012-12-04 - Donal Hill diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py index b2c7fad7a..a3a602d2d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuons.py @@ -46,6 +46,9 @@ _locations.update ( locations ) from CommonParticles.StdTightANNUpMuons import * _locations.update ( locations ) +from CommonParticles.StdLooseDownMuons import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py index a621a2783..0cf063a33 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedDiElectron.py @@ -19,7 +19,7 @@ StdLooseDetachedDiElectron.DecayDescriptor = "J/psi(1S) -> e+ e-" StdLooseDetachedDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] StdLooseDetachedDiElectron.DaughtersCuts = { "e+" : "(PT>200*MeV) & (MIPCHI2DV(PRIMARY)>1.)" } StdLooseDetachedDiElectron.CombinationCut = "(ADOCACHI2CUT(30,''))" -StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25) & (MM>20*MeV)" +StdLooseDetachedDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" locations = updateDoD(StdLooseDetachedDiElectron) ## ============================================================================ diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py new file mode 100644 index 000000000..6107dd6c2 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDownMuons.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseMuons.py,v 1.7 2009-08-04 09:05:31 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseMuons.py +# configuration file for 'Standard Loose Muons' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Loose Muons' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.7 $" +# ============================================================================= +__all__ = ( + 'StdLooseDownMuons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombinedParticleMaker +from Configurables import ProtoParticleMUONFilter +from CommonParticles.Utils import * + +## create the algorithm +algorithm = CombinedParticleMaker ( 'StdLooseDownMuons', + Particle = 'muon' ) + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = ['Downstream'] ) + +# protoparticle filter: +fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) +fltr.Selection = [ "RequiresDet='MUON' IsMuon=True" ] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdLooseDownMuons = algorithm + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py index 6110491ae..3c19fb0af 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py +++ b/Phys/CommonParticles/python/CommonParticles/StdV0FromBrunel.py @@ -34,9 +34,10 @@ V0Maker = V0FromDstMaker() dod = DataOnDemandSvc() for v0 in v0locations: - p = { hat + v0 + '/Particles' : V0Maker.getFullName() } - dod.AlgMap.update( p ) - locations.update ( p ) + p1 = { hat + v0 + '/Particles' : V0Maker.getFullName() } + p2 = { hat + v0 + '/Particles' : V0Maker } + dod.AlgMap.update( p1 ) + locations.update ( p2 ) ## ============================================================================ if '__main__' == __name__ : @@ -44,7 +45,7 @@ if '__main__' == __name__ : print __doc__ print __author__ print __version__ - print locations + print locationsDoD ( locations ) # ============================================================================= # The END -- GitLab From f91addf8a74b4e5f73c53622ef0fe6d1f90578ab Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:10:33 +0100 Subject: [PATCH 23/50] v7r1 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 6 ++++++ .../python/CommonParticles/StdAllLooseANNElectrons.py | 2 +- .../python/CommonParticles/StdAllLooseANNKaons.py | 2 +- .../python/CommonParticles/StdAllLooseANNPions.py | 2 +- .../python/CommonParticles/StdAllLooseANNProtons.py | 2 +- .../python/CommonParticles/StdLooseANNDownElectrons.py | 2 +- .../python/CommonParticles/StdLooseANNDownKaons.py | 2 +- .../python/CommonParticles/StdLooseANNDownPions.py | 2 +- .../python/CommonParticles/StdLooseANNDownProtons.py | 2 +- .../python/CommonParticles/StdLooseANNUpElectrons.py | 2 +- .../python/CommonParticles/StdLooseANNUpKaons.py | 2 +- .../python/CommonParticles/StdLooseANNUpPions.py | 2 +- .../python/CommonParticles/StdLooseANNUpProtons.py | 2 +- .../python/CommonParticles/StdTightANNDownElectrons.py | 2 +- .../python/CommonParticles/StdTightANNDownKaons.py | 2 +- .../python/CommonParticles/StdTightANNDownPions.py | 2 +- .../python/CommonParticles/StdTightANNDownProtons.py | 2 +- .../python/CommonParticles/StdTightANNElectrons.py | 2 +- .../python/CommonParticles/StdTightANNMuons.py | 2 +- .../python/CommonParticles/StdTightANNPions.py | 2 +- .../python/CommonParticles/StdTightANNProtons.py | 2 +- .../python/CommonParticles/StdTightANNUpElectrons.py | 2 +- .../python/CommonParticles/StdTightANNUpKaons.py | 2 +- .../python/CommonParticles/StdTightANNUpPions.py | 2 +- .../python/CommonParticles/StdTightANNUpProtons.py | 2 +- 28 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 8e5853fc8..050fe823e 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r13) +gaudi_subdir(CommonParticles v8r14) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index acf4aabb7..a5da8955a 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r13 +version v8r14 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 2735b1c92..e8c97ded3 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r13 +v8r14 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 598ea5a8f..9e806d41c 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,12 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r14 2013-07-05 ========================= + +! 2013-07-04 - Chris Jones + - Update ANNPID Stable Common Particles with new cut values tuned for the + latest "MC12TuneV2" tuning. + !========================= CommonParticles v8r13 2013-04-05 ========================= ! 2013-03-29 - Jibo He diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py index a8d9a6972..74a015fd9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNElectrons.py @@ -32,7 +32,7 @@ selector = trackSelector ( algorithm ) fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.09'" ] #fltr.Selection = [ "ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.25'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py index eb6dd4b94..d5a2d020f 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNKaons.py @@ -30,7 +30,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] -fltr.Selection = [ "ProbNNk>'0.025'" ] +fltr.Selection = [ "ProbNNk>'0.02'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py index 8d3320a89..9ad5eb1a0 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNPions.py @@ -31,7 +31,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.05'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py index 39aa8850e..01e00e8e4 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseANNProtons.py @@ -31,7 +31,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.05'" ] -fltr.Selection = [ "ProbNNp>'0.0125'" ] +fltr.Selection = [ "ProbNNp>'0.01'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py index 3b31aaf64..f52602282 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.035'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py index f01cdf744..17e2151dc 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.075'" ] -fltr.Selection = [ "ProbNNk>'0.075'" ] +fltr.Selection = [ "ProbNNk>'0.05'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py index e2aa519bf..369a523e9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py index 42a765359..812ec6b50 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNDownProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] -fltr.Selection = [ "ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.04'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py index f8217582c..acd133578 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.1'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py index 9d4cc93e3..5cdacdeb8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.1'" ] -fltr.Selection = [ "ProbNNk>'0.1'" ] +fltr.Selection = [ "ProbNNk>'0.025'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py index 9c3e5fb58..da9e2c830 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.1'" ] -fltr.Selection = [ "ProbNNpi>'0.1'" ] +fltr.Selection = [ "ProbNNpi>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py index 8c2bb3950..fe2c64b9c 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseANNUpProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.1'" ] -fltr.Selection = [ "ProbNNp>'0.1'" ] +fltr.Selection = [ "ProbNNp>'0.03'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py index 3a2072a74..3e55ccc3a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.07'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py index 36bac0965..10b4c514a 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] -fltr.Selection = [ "ProbNNk>'0.2'" ] +fltr.Selection = [ "ProbNNk>'0.15'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py index a05b8f627..e4da68463 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] -fltr.Selection = [ "ProbNNpi>'0.2'" ] +fltr.Selection = [ "ProbNNpi>'0.07'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py index f14a41794..73e43b749 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNDownProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] -fltr.Selection = [ "ProbNNp>'0.2'" ] +fltr.Selection = [ "ProbNNp>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py index ea48691cb..92bff470d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNElectrons.py @@ -34,7 +34,7 @@ selector = trackSelector ( algorithm ) fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ] #fltr.Selection = [ "ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.35'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.16'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py index de8326e3a..28736d215 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNMuons.py @@ -34,7 +34,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' ) #fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ] -fltr.Selection = [ "ProbNNmu>'0.1'" ] +fltr.Selection = [ "ProbNNmu>'0.01'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py index 1d41a180e..55c12b6e3 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNPions.py @@ -30,7 +30,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) -fltr.Selection = [ "ProbNNpi>'0.55'" ] +fltr.Selection = [ "ProbNNpi>'0.6'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py index 85a279799..45b55c570 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm ) # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.125'" ] -fltr.Selection = [ "ProbNNp>'0.021'" ] +fltr.Selection = [ "ProbNNp>'0.02'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py index 161ec60cb..9a6032a06 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpElectrons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.2'" ] -fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.2'" ] +fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py index b6ac65a34..4d55a42b9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpKaons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ] -fltr.Selection = [ "ProbNNk>'0.2'" ] +fltr.Selection = [ "ProbNNk>'0.09'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py index 6e058e832..e2463ac9b 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpPions.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ] -fltr.Selection = [ "ProbNNpi>'0.2'" ] +fltr.Selection = [ "ProbNNpi>'0.1'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py index f91068af7..0c6345a21 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightANNUpProtons.py @@ -33,7 +33,7 @@ selector = trackSelector ( algorithm, # protoparticle filter: fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' ) #fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ] -fltr.Selection = [ "ProbNNp>'0.2'" ] +fltr.Selection = [ "ProbNNp>'0.075'" ] ## configure Data-On-Demand service locations = updateDoD ( algorithm ) -- GitLab From ec23b242c61645e81f64c2613447ed4f8f4f3a13 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:10:49 +0100 Subject: [PATCH 24/50] v7r2 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 5 +++++ .../python/CommonParticles/StdMassConstrainedJpsi2MuMu.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 050fe823e..86eed804e 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r14) +gaudi_subdir(CommonParticles v8r15) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index a5da8955a..60c4c9b5c 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r14 +version v8r15 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index e8c97ded3..8c97f72d4 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r14 +v8r15 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 9e806d41c..17a98c3ea 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,11 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r15 2013-09-18 ========================= + +! 2013-08-23 - Roel Aaij + - Widen the mass window to 150 MeV in StdMassConstrainedJpsi. + !========================= CommonParticles v8r14 2013-07-05 ========================= ! 2013-07-04 - Chris Jones diff --git a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py index 92e312d26..880cde9ad 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py +++ b/Phys/CommonParticles/python/CommonParticles/StdMassConstrainedJpsi2MuMu.py @@ -27,7 +27,7 @@ StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu") StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"] StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-" StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : '(PIDmu > 0) & (PT > 0.5*GeV)' } -StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 80.*MeV) & (ADOCACHI2CUT(20, ''))" +StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 150.*MeV) & (ADOCACHI2CUT(20, ''))" StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)" ## configure Data-On-Demand service -- GitLab From dc7686fae1f3be9f10f259e61053af2b3d589337 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:11:10 +0100 Subject: [PATCH 25/50] v7r3 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 5 +++++ Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 86eed804e..78b20af14 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r15) +gaudi_subdir(CommonParticles v8r16) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 60c4c9b5c..a730e5d25 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r15 +version v8r16 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 8c97f72d4..3fb8d8142 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r15 +v8r16 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 17a98c3ea..5035e4d3a 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,11 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r16 2013-10-29 ========================= + +! 2013-10-25 - Chris Jones + - Remove CC in StdLooseRho0 + !========================= CommonParticles v8r15 2013-09-18 ========================= ! 2013-08-23 - Roel Aaij diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py index 3452fa725..a052e1640 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseRho0.py @@ -27,7 +27,7 @@ from CommonParticles.Utils import * StdLooseRho0 = CombineParticles ( 'StdLooseRho0' ) StdLooseRho0.Inputs = [ "Phys/StdLoosePions/Particles" ] -StdLooseRho0.DecayDescriptor = "[rho(770)0 -> pi+ pi-]cc" +StdLooseRho0.DecayDescriptor = "rho(770)0 -> pi+ pi-" StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)& (ADOCACHI2CUT(15, ''))" StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" -- GitLab From fe99af738175d461b6b5781c5a4fb21fe3967d92 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:11:25 +0100 Subject: [PATCH 26/50] v7r4 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 14 ++++++ .../python/CommonParticles/StandardBasic.py | 3 ++ .../python/CommonParticles/StandardJets.py | 41 +++++++++++++++++ .../python/CommonParticles/StdJets.py | 43 ++++++++++++++++++ .../python/CommonParticles/StdParticleFlow.py | 45 +++++++++++++++++++ 8 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 Phys/CommonParticles/python/CommonParticles/StandardJets.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdJets.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 78b20af14..8e13f9737 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r16) +gaudi_subdir(CommonParticles v8r17) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index a730e5d25..db936268b 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r16 +version v8r17 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 3fb8d8142..378737f00 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r16 +v8r17 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 5035e4d3a..7c9638d3e 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,20 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r17 2013-12-18 ========================= + + +! 2013-12-17 - Cédric Potterat + - remove a "print" in StdParticleFlow + +! 2013-12-10 - Cédric Potterat + - Adding: + . StdJets.py + . StdParticleFlow.py + . StandardJets.py + - Modifying: + . StandardBasic.py (Adding StandardJets.py) + !========================= CommonParticles v8r16 2013-10-29 ========================= ! 2013-10-25 - Chris Jones diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py index bd384b092..be9a2eb98 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardBasic.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasic.py @@ -22,6 +22,9 @@ _locations.update ( locations ) from CommonParticles.StandardBasicNeutral import * _locations.update ( locations ) +from CommonParticles.StandardJets import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardJets.py b/Phys/CommonParticles/python/CommonParticles/StandardJets.py new file mode 100644 index 000000000..5a02e89a4 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardJets.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StandardBasic.py,v 1.4 2009-10-09 12:41:27 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StandardBasic.py +# configuration file for 'Standard Basic' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard Basic' particles +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= + +_locations = {} + +from CommonParticles.StdParticleFlow import * +_locations.update ( locations ) + +from CommonParticles.StdJets import * +_locations.update ( locations ) + +# redefine the locations +locations = _locations + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + from CommonParticles.Utils import locationsDoD + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= + + diff --git a/Phys/CommonParticles/python/CommonParticles/StdJets.py b/Phys/CommonParticles/python/CommonParticles/StdJets.py new file mode 100644 index 000000000..252739118 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdJets.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdJets' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * + +from JetAccessories.JetMaker_Config import JetMakerConf +algorithm = JetMakerConf("StdJets").algorithms[0] + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdJets = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py b/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py new file mode 100644 index 000000000..ca29c813c --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdParticleFlow.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdParticleFlow' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * + + +from JetAccessories.ParticleFlow_Config import ParticleFlowConf +algorithm = ParticleFlowConf("PF" , _MCCor = False ).PFSeq + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + + +## finally: define the symbol +StdParticleFlow = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From a3251875b1524bdb6f41452c665813fc5103cb77 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:11:46 +0100 Subject: [PATCH 27/50] v8r0 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 5 +++++ .../python/CommonParticles/StdLooseDetachedTau.py | 13 ++++++------- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 8e13f9737..c974b520b 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r17) +gaudi_subdir(CommonParticles v8r18) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index db936268b..bb7630d4a 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r17 +version v8r18 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 378737f00..98a91fd6d 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r17 +v8r18 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 7c9638d3e..ee733ce4e 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,11 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r18 2014-01-22 ========================= + +! 2014-01-19 - Giampiero Mancinelli +- Heavily changed StdLooseDetachedTau list for B->tautau, B->taumu in StdLooseDetachedTau.py + !========================= CommonParticles v8r17 2013-12-18 ========================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 7b2f57f51..424097d56 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -4,8 +4,9 @@ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' -# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli # @date 2012-12-02 +# Strongly modified 2012-14-01 by Giampiero Mancinelli # ============================================================================= """ Configuration file for 'Standard Loose Detached Tau' @@ -32,16 +33,14 @@ StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", - "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)", + "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)" } -#Need an upper mass window of 100 MeV for background estimation -#and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" -StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" +StdLooseDetachedTau3pi.CombinationCut = "(APT>800.*MeV) & ((AM>400.*MeV) & (AM<2100.*MeV)) & (AMAXDOCA('')<0.2*mm) & (ANUM(PT > 800*MeV) >= 1) " +StdLooseDetachedTau3pi.MotherCut = "(PT>1000.*MeV) & (M>500.*MeV) & (M<2000.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 16) & (BPVVDCHI2>16) & (BPVVDRHO>0.1*mm) & (BPVVDRHO<7.0*mm) & (BPVVDZ>5.0*mm)" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDetachedTau3pi ) -- GitLab From 93736e533875201d6de2105fc02834db956f41af Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Tue, 3 Mar 2015 18:13:37 +0100 Subject: [PATCH 28/50] v9r1 --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 12 +-- Phys/CommonParticles/cmt/version.cmt | 2 +- Phys/CommonParticles/doc/release.notes | 73 +++++++++++++------ .../CommonParticles/StandardBasicNeutral.py | 3 + .../python/CommonParticles/StandardJets.py | 3 + .../python/CommonParticles/StandardPi0.py | 5 ++ .../python/CommonParticles/StandardTau.py | 2 + .../StdAllLooseGammaConversion.py | 14 ++-- .../StdAllTightGammaConversion.py | 14 ++-- .../StdAllTightSymGammaConversion.py | 19 ++++- .../python/CommonParticles/StdJetsR07.py | 42 +++++++++++ .../CommonParticles/StdLooseDalitzPi0.py | 66 +++++++++++++++++ .../CommonParticles/StdLooseDetachedTau.py | 13 ++-- .../CommonParticles/StdLooseDiElectron.py | 16 +++- .../python/CommonParticles/StdLooseLambda.py | 43 ++++++++++- .../CommonParticles/StdLooseMergedPi0.py | 3 - .../CommonParticles/StdLooseResolvedPi0.py | 4 - .../CommonParticles/StdTightDetachedTau.py | 62 ++++++++++++++++ 19 files changed, 333 insertions(+), 65 deletions(-) create mode 100644 Phys/CommonParticles/python/CommonParticles/StdJetsR07.py create mode 100644 Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py create mode 100755 Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index c974b520b..e4b237fbe 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r18) +gaudi_subdir(CommonParticles v8r19) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index bb7630d4a..e5285d14e 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,21 +6,21 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r18 +version v8r19 #============================================================================ -# Structure, i.e. directories to process. +# Structure, i.e. directories to process. #============================================================================ -branches cmt doc python +branches cmt doc python -use GaudiPolicy v* +use GaudiPolicy v* use TrackTools v* Tr -apply_pattern install_python_modules +apply_pattern install_python_modules #============================================================================ -# Used packages. +# Used packages. #============================================================================ use DaVinciKernel v* Phys #============================================================================ diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt index 98a91fd6d..f4786c6a1 100644 --- a/Phys/CommonParticles/cmt/version.cmt +++ b/Phys/CommonParticles/cmt/version.cmt @@ -1 +1 @@ -v8r18 +v8r19 diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index ee733ce4e..4daa5ed24 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,33 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r19 2014-10-30 ========================= + +! 2014-10-30 - Stefano Perazzini + - Fixed test_inputlocations_consistency.py addint "/Particles" to the Inputs + of StdLooseDalitzPi0 + +! 2014-09-22 - Olivier Deschamps + - move to Loki::VertexFitter in DiElectron making + + +! 2014-09-04 - Julien Cogan + - Rename StdLooseDetachedTau3pi to StdTightDetachedTau3pi and restore previous + version of the loose selection + +! 2014-08-25 - Cedric Potterat + - Add StdJetsR07 to StandardJets + +! 2014-08-25 - Daniel O'Hanlon + - Add LambdaLD to StdLooseLambda + +! 2014-08-13 - Chris Jones + - Fix a bug that prevented StdLooseDiElectron being used as a + Standard Particle. + +! 2014-08-08 - Chris Jones + - Add StdLooseDiElectron to StandardBasicNeutral module. + !========================= CommonParticles v8r18 2014-01-22 ========================= ! 2014-01-19 - Giampiero Mancinelli @@ -53,12 +80,12 @@ ! 2013-03-27 - Vanya Belyaev - - fixed StdV0FromBrunel - (thanks to Philippe Ghez) + - fixed StdV0FromBrunel + (thanks to Philippe Ghez) !========================= CommonParticles v8r12 2012-12-20 ========================= -! 2012-12-04 - Donal Hill +! 2012-12-04 - Donal Hill - Changes to common particles StdLooseDetachedTauNonPhys.py and StdLooseDetachedTau.py !========================= CommonParticles v8r11 2012-11-30 ========================= @@ -72,12 +99,12 @@ + Add some missing imports ! 2012-11-07 - Olivier Deschamps for Edwige Tournefier - - improve diElectron vertexing for DD configuration (new settings comes with + - improve diElectron vertexing for DD configuration (new settings comes with updated DiElectronMaker) !========================= CommonParticles v8r10 2012-09-01 ========================= -! 2012-09-01 - Anton Poluektov +! 2012-09-01 - Anton Poluektov - fix test_inputlocations_consistency ! 2012-08-30 - Olivier Deschamps @@ -88,7 +115,7 @@ - Removed lines related to StdVeryLooseKs from StandardV0.py ! 2012-08-23 - Thomas Blake - - Added StandardTau and StandardDipion to StandardIntermediate + - Added StandardTau and StandardDipion to StandardIntermediate !========================= CommonParticles v8r9 2012-06-28 ========================= @@ -100,19 +127,19 @@ called `StdDiElectronFromTracks' ! 2012-06-12 - Olivier Deschamps for Edwige Tournefier - - add StdAllTightSymGammaConversion.py : combinatorial gamma->ee from + - add StdAllTightSymGammaConversion.py : combinatorial gamma->ee from symmetrized e pT ! 2012-06-12 - Olivier Deschamps - - StdAllLoose(Tight)GammaConversion.py : produce gamma->ee particle + - StdAllLoose(Tight)GammaConversion.py : produce gamma->ee particle (based on DiElectronMaker) ! 2012-05-14 - Olivier Deschamps - - StdVeryLooseAllPhotons.py: photons with pT threshold down to 100 MeV + - StdVeryLooseAllPhotons.py: photons with pT threshold down to 100 MeV (for new BremStrahlung recovery) ! 2012-06-8 - P. Koppenburg - - New StdKsFromV0 that make Ks particles from the V0 Brunel objects. + - New StdKsFromV0 that make Ks particles from the V0 Brunel objects. !========================= CommonParticles v8r8 2012-04-27 ========================= @@ -126,13 +153,13 @@ - StdLooseResolvedPi0.py: - add "wide" pi0->gamma gamma + add "wide" pi0->gamma gamma ! 2012-02-19 - Vanya Belyaev - StdLooseResolvedEta.py: - add "wide" eta->gamma gamma + add "wide" eta->gamma gamma !========================= CommonParticles v8r6 2012-02-10 ========================= ! 2012-02-03 - Jibo He @@ -140,17 +167,17 @@ ! 2012-02-01 - Jibo He - StdDetachedKstar - Renamed as StdLooseDetachedKpi, to better reflect what's inside. + Renamed as StdLooseDetachedKpi, to better reflect what's inside. ! 2012-01-31 - Jibo He - StdVeryLooseDetachedKstar - Commented out daughters cuts to save a little bit CPU, + Commented out daughters cuts to save a little bit CPU, because tighter cuts IPCHI2>4 already applied on StdLoose{Kaons,Pions} - StdDetachedKstar New KSTAR particle with mass up to 2.2 GeV. ! 2012-01-31 - Jibo He - - Added StdLooseDetachedDiElectron, with cuts of PT>200 MeV, IPS>1 on both electrons, + - Added StdLooseDetachedDiElectron, with cuts of PT>200 MeV, IPS>1 on both electrons, and M(ee)>20 MeV. ! 2012-01-27 - Chris Jones @@ -170,17 +197,17 @@ !========================= CommonParticles v8r5 2011-09-15 ========================= ! 2011-09-14 - Ulrich Kerzel -- Add NoBremNoPIDs*Electrons for all types: Track as electron, no PID requirement, +- Add NoBremNoPIDs*Electrons for all types: Track as electron, no PID requirement, no Bremsstrahlung correction ! 2011-08-27 - Susan Haines - - Added StdVeryLooseKs.py, LL and DD Kshorts. LL using StdAllNoPIDsPions for - daughters (no default pT cut). Added for use in StrippingBu2D0h_D02KShh_NoPID + - Added StdVeryLooseKs.py, LL and DD Kshorts. LL using StdAllNoPIDsPions for + daughters (no default pT cut). Added for use in StrippingBu2D0h_D02KShh_NoPID and WS lines. - Added StdVeryLooseKs to StandardV0.py - + ! 2011-08-26 Carla Gobel & Sandra Amato - - Added StdTightDplus.py to be used in KKPos stripping line and included in + - Added StdTightDplus.py to be used in KKPos stripping line and included in StandardDplus.py ! 2011-08-25 - Greig Cowan @@ -188,10 +215,10 @@ ! 2011-08-19 - Jibo He - StdLooseDiElectron - . Added PT>500 MeV for electron to speed up. + . Added PT>500 MeV for electron to speed up. !2011-08-19 Hamish Gordon - - Add CommonParticles for D(s)->KKK and Ds->K+K+pi-, with Oxford/Rio stripping + - Add CommonParticles for D(s)->KKK and Ds->K+K+pi-, with Oxford/Rio stripping selection to keep the timing down !========================= CommonParticles v8r4 2011-08-04 ========================= @@ -199,7 +226,7 @@ - Add in ADOCACHI2 to all two body decays, add EOL native everywhere ! 2011-08-03 - Rob Lambert - - Rolf added back in the ADOCACHI2 cuts to Ks and lambda, it improves the timing + - Rolf added back in the ADOCACHI2 cuts to Ks and lambda, it improves the timing by a lot. !========================= CommonParticles v8r3 2011-07-22 ========================= diff --git a/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py b/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py index 7699538b0..b90f9bc99 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py @@ -25,6 +25,9 @@ _locations.update ( locations ) from CommonParticles.StandardEta import * _locations.update ( locations ) +from CommonParticles.StdLooseDiElectron import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardJets.py b/Phys/CommonParticles/python/CommonParticles/StandardJets.py index 5a02e89a4..891ff002f 100644 --- a/Phys/CommonParticles/python/CommonParticles/StandardJets.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardJets.py @@ -22,6 +22,9 @@ _locations.update ( locations ) from CommonParticles.StdJets import * _locations.update ( locations ) +from CommonParticles.StdJetsR07 import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPi0.py b/Phys/CommonParticles/python/CommonParticles/StandardPi0.py index cc7421b0a..1aa58be21 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardPi0.py @@ -22,6 +22,11 @@ _locations.update ( locations ) from CommonParticles.StdLooseResolvedPi0 import * _locations.update ( locations ) +from CommonParticles.StdLooseDalitzPi0 import * +_locations.update ( locations ) + + + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardTau.py b/Phys/CommonParticles/python/CommonParticles/StandardTau.py index d78775211..57e470e70 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardTau.py @@ -18,6 +18,8 @@ _locations = {} from CommonParticles.StdLooseDetachedTau import * _locations.update ( locations ) +from CommonParticles.StdTightDetachedTau import * +_locations.update ( locations ) # redefine the locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py index ed2c4faa5..908e77359 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllLooseGammaConversion.py @@ -23,7 +23,8 @@ from Gaudi.Configuration import * from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * from Configurables import ( DiElectronMaker, ProtoParticleCALOFilter, - OfflineVertexFitter, ParticleTransporter ) + ParticleTransporter ) +from Configurables import LoKi__VertexFitter ###--- Long pair dieLL = DiElectronMaker('StdAllLooseGammaLL') @@ -52,11 +53,12 @@ dieDD.DiElectronPtMin = 200.*MeV dieDD.UseCombinePair = True dieDD.addTool( ParticleTransporter, name='TransporterDie' ) dieDD.TransporterDie.TrackExtrapolator = "TrackRungeKuttaExtrapolator" -dieDD.ParticleCombiners.update( { "" : "OfflineVertexFitter"} ) -dieDD.addTool( OfflineVertexFitter ) -dieDD.OfflineVertexFitter.addTool( ParticleTransporter, name='Transporter' ) -dieDD.OfflineVertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" -dieDD.OfflineVertexFitter.maxDeltaZ = 100 * mm + +dieDD.ParticleCombiners.update( { "" : "LoKi::VertexFitter"} ) +dieDD.addTool( LoKi__VertexFitter ) +dieDD.LoKi__VertexFitter.addTool( ParticleTransporter, name='Transporter' ) +dieDD.LoKi__VertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieDD.LoKi__VertexFitter.DeltaDistance = 100 * mm locations.update( updateDoD ( dieDD )) StdAllLooseGammaDD=dieDD diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py index 21a9b2809..276047fe3 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllTightGammaConversion.py @@ -23,7 +23,8 @@ from Gaudi.Configuration import * from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * from Configurables import ( DiElectronMaker, ProtoParticleCALOFilter, - OfflineVertexFitter, ParticleTransporter ) + ParticleTransporter ) +from Configurables import LoKi__VertexFitter ###--- Long pair dieLL = DiElectronMaker('StdAllTightGammaLL') @@ -52,11 +53,12 @@ dieDD.DiElectronPtMin = 200.*MeV dieDD.UseCombinePair = True dieDD.addTool( ParticleTransporter, name='TransporterDie' ) dieDD.TransporterDie.TrackExtrapolator = "TrackRungeKuttaExtrapolator" -dieDD.ParticleCombiners.update( { "" : "OfflineVertexFitter"} ) -dieDD.addTool( OfflineVertexFitter ) -dieDD.OfflineVertexFitter.addTool( ParticleTransporter, name='Transporter' ) -dieDD.OfflineVertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" -dieDD.OfflineVertexFitter.maxDeltaZ = 100 * mm + +dieDD.ParticleCombiners.update( { "" : "LoKi::VertexFitter"} ) +dieDD.addTool( LoKi__VertexFitter ) +dieDD.LoKi__VertexFitter.addTool( ParticleTransporter, name='Transporter' ) +dieDD.LoKi__VertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieDD.LoKi__VertexFitter.DeltaDistance = 100 * mm locations.update( updateDoD ( dieDD ) ) StdAllTightGammaDD=dieDD diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py b/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py index 48e94f320..5e107b594 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllTightSymGammaConversion.py @@ -22,10 +22,12 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * +from Configurables import ( DiElectronMaker, ProtoParticleCALOFilter, + ParticleTransporter ) +from Configurables import LoKi__VertexFitter ###--- Long pair -from Configurables import DiElectronMaker,ProtoParticleCALOFilter dieSymLL = DiElectronMaker('StdAllTightSymGammaLL') dieSymLL.DecayDescriptor = "gamma -> e+ e-" selector = trackSelector ( dieSymLL , trackTypes = [ "Long"]) @@ -34,7 +36,7 @@ dieSymLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] dieSymLL.DeltaY = 3. dieSymLL.DeltaYmax = 200 * mm dieSymLL.DiElectronMassMax = 100.*MeV -dieSymLL.DiElectronPtMin = 400.*MeV +dieSymLL.DiElectronPtMin = 200.*MeV dieSymLL.SymetricPair = True locations = updateDoD ( dieSymLL ) @@ -49,9 +51,20 @@ dieSymDD.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"] dieSymDD.DeltaY = 3. dieSymDD.DeltaYmax = 200 * mm dieSymDD.DiElectronMassMax = 100.*MeV -dieSymDD.DiElectronPtMin = 400.*MeV +dieSymDD.DiElectronPtMin = 200.*MeV dieSymDD.SymetricPair = True +#-- improved vertex fitter settings +dieSymDD.UseCombinePair = True +dieSymDD.addTool( ParticleTransporter, name='TransporterDie' ) +dieSymDD.TransporterDie.TrackExtrapolator = "TrackRungeKuttaExtrapolator" + +dieSymDD.ParticleCombiners.update( { "" : "LoKi::VertexFitter"} ) +dieSymDD.addTool( LoKi__VertexFitter ) +dieSymDD.LoKi__VertexFitter.addTool( ParticleTransporter, name='Transporter' ) +dieSymDD.LoKi__VertexFitter.Transporter.TrackExtrapolator = "TrackRungeKuttaExtrapolator" +dieSymDD.LoKi__VertexFitter.DeltaDistance = 100 * mm + locations.update( updateDoD ( dieSymDD ) ) StdAllTightSymGammaDD=dieSymDD diff --git a/Phys/CommonParticles/python/CommonParticles/StdJetsR07.py b/Phys/CommonParticles/python/CommonParticles/StdJetsR07.py new file mode 100644 index 000000000..a2237dd2b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdJetsR07.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Pions' +""" +__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdJets' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from CommonParticles.Utils import * + +from JetAccessories.JetMaker_Config import JetMakerConf +algorithm = JetMakerConf("StdJetsR07", R=0.7).algorithms[0] +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdJets = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py new file mode 100644 index 000000000..af802ee54 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDalitzPi0.py,v 1.3 2009-04-22 14:17:39 pkoppenb Exp $ +# ============================================================================= +## @file CommonParticles/StdLooseDalitzPi0.py +# configuration file for 'Standard Loose Dalitz Pi0s and Pi0 with photon conversion' +# @author Olivier Deschamps +# @date 2014-05-20 +# ============================================================================= +""" +Configuration file for 'Standard Loose DalitzPi0' +""" +__author__ = "Olivier Deschamps" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.3 $" +# ============================================================================= +__all__ = ( + 'StdLoosePi02gee' , + 'StdLoosePi024e' , + 'StdLooseDalitzPi0' , + 'locations' + ) +# ============================================================================= +from GaudiKernel.SystemOfUnits import MeV +from CommonParticles.Utils import * +from Configurables import CombineParticles + +## create the algorithm : pi0 -> gg(ee) (1 conversion) +pi02gee = CombineParticles( "StdLoosePi02gee", DecayDescriptor = 'pi0 -> gamma gamma' ) +pi02gee.Inputs = ["Phys/StdLooseAllPhotons/Particles","Phys/StdAllLooseGammaLL/Particles","Phys/StdAllLooseGammaDD/Particles"] +pi02gee.ParticleCombiners.update( {"" : "ParticleAdder"} ) +pi02gee.Preambulo += ["cnv = switch(INTES('StdLooseAllPhotons',False),1,0)"] +pi02gee.MotherCut = " (MM < 170*MeV) & (MM > 90*MeV) & (1 == CHILD(1,cnv)+CHILD(2,cnv) )" +locations = updateDoD ( pi02gee ) +StdLoosePi02gee=pi02gee + +## create the algorithm : pi0 -> g(ee)g(ee) (2 conversions) +pi024e = CombineParticles( "StdLoosePi024e", DecayDescriptor = 'pi0 -> gamma gamma' ) +pi024e.Inputs = ["Phys/StdAllLooseGammaLL","Phys/StdAllLooseGammaDD/Particles"] +pi024e.ParticleCombiners.update( {"" : "ParticleAdder"} ) +#pi024e.ParticleCombiners.update( {"" : "LoKi::VertexFitter"} ) +pi024e.MotherCut = " (MM < 170*MeV) & (MM > 90*MeV)" +locations.update( updateDoD ( pi024e ) ) +StdLoosePi024e=pi024e + +## create the algorithm : pi0 -> gee (Dalitz decay) - note : also contains Long-Long contribution to 1 conversion gg(ee) +from CommonParticles.StdLooseDiElectron import * +pi0Dalitz = CombineParticles( "StdLooseDalitzPi0", DecayDescriptor = 'pi0 -> gamma gamma' ) +pi0Dalitz.Inputs = ["Phys/StdLooseAllPhotons/Particles","Phys/StdDiElectronGamma/Particles"] +#pi0Dalitz.ParticleCombiners.update( {"" : "ParticleAdder"} ) +pi0Dalitz.ParticleCombiners.update( {"" : "LoKi::VertexFitter"} ) +pi0Dalitz.Preambulo += ["cnv = switch(INTES('StdLooseAllPhotons',False),1,0)"] +pi0Dalitz.MotherCut = " (MM < 170*MeV) & (MM > 90*MeV) & (1 == CHILD(1,cnv)+CHILD(2,cnv) )" +locations.update( updateDoD ( pi0Dalitz ) ) +StdLooseDalitzPi0=pi0Dalitz + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 424097d56..7b2f57f51 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -4,9 +4,8 @@ # ============================================================================= ## @file CommonParticles/StdLooseDetachedTau.py # configuration file for 'Standard Loose Detached Tau' -# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser # @date 2012-12-02 -# Strongly modified 2012-14-01 by Giampiero Mancinelli # ============================================================================= """ Configuration file for 'Standard Loose Detached Tau' @@ -33,14 +32,16 @@ StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)", - "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)" + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", + "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } +#Need an upper mass window of 100 MeV for background estimation +#and a lower mass window of 200 to catch the D+ and Ds -StdLooseDetachedTau3pi.CombinationCut = "(APT>800.*MeV) & ((AM>400.*MeV) & (AM<2100.*MeV)) & (AMAXDOCA('')<0.2*mm) & (ANUM(PT > 800*MeV) >= 1) " -StdLooseDetachedTau3pi.MotherCut = "(PT>1000.*MeV) & (M>500.*MeV) & (M<2000.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 16) & (BPVVDCHI2>16) & (BPVVDRHO>0.1*mm) & (BPVVDRHO<7.0*mm) & (BPVVDZ>5.0*mm)" +StdLooseDetachedTau3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (1<ANUM( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY)>5)))" +StdLooseDetachedTau3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )" ## configure Data-On-Demand service locations = updateDoD ( StdLooseDetachedTau3pi ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py index 46087f42a..c8f2d2720 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDiElectron.py @@ -11,6 +11,8 @@ from Configurables import CombineParticles from CommonParticles.Utils import * import GaudiKernel.SystemOfUnits as Units +locations = { } + ########################### # StdLooseDiElectron # ########################### @@ -23,25 +25,31 @@ StdLooseDiElectron.Inputs = ["Phys/StdAllLooseElectrons/Particles"] StdLooseDiElectron.DaughtersCuts = { "e+" : "(PT>500*MeV)" } StdLooseDiElectron.CombinationCut = "(AM>30*MeV) & (ADOCACHI2CUT(30,''))" StdLooseDiElectron.MotherCut = "(VFASPF(VCHI2)<25)" -locations = updateDoD(StdLooseDiElectron) +locations.update( updateDoD(StdLooseDiElectron) ) """ Using Olivier's Di-Electron Particle Maker """ ###--- From Olivier's ParticleMaker -from Configurables import DiElectronMaker,ProtoParticleCALOFilter +from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiKernel.SystemOfUnits import * dieLL = DiElectronMaker('StdDiElectronFromTracks') dieLL.Particle = "J/psi(1S)" -selector = trackSelector ( dieLL , trackTypes = [ "Long"]) +selector = trackSelector ( dieLL , trackTypes = ["Long"] ) dieLL.addTool( ProtoParticleCALOFilter, name='Electron' ) dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'-2.0'"] dieLL.DiElectronMassMax = 5000.*MeV dieLL.DiElectronMassMin = 0.*MeV dieLL.DiElectronPtMin = 200.*MeV -locations = updateDoD ( dieLL ) +locations.update( updateDoD(dieLL) ) StdDiElectronFromTracks = dieLL +# gamma version (clone) +StdDiElectronGamma = DiElectronMaker('StdDiElectronFromTracks').clone("StdDiElectronGamma") +StdDiElectronGamma.Particle = "gamma" +locations.update(updateDoD( StdDiElectronGamma )) + + ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py index f04466a97..f00d1eaeb 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseLambda.py @@ -16,11 +16,12 @@ __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.2 __all__ = ( 'StdLooseLambdaLL' , 'StdLooseLambdaDD' , + 'StdLooseLambdaLD' , 'locations' ) # ============================================================================= from Gaudi.Configuration import * -from Configurables import CombineParticles +from Configurables import CombineParticles, FilterDesktop from CommonParticles.Utils import * ## ============================================================================ @@ -61,7 +62,45 @@ StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV) & (ADOCACHI2CUT(2 StdLooseLambdaDD.MotherCut = "(ADMASS('Lambda0')<64*MeV) & (VFASPF(VCHI2)<25)" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseLambdaDD ) +locations.update( updateDoD ( StdLooseLambdaDD ) ) + +## ============================================================================ +# configuration file for 'Standard Loose Long-Downstream ' +# @author Daniel O'Hanlon +# @date 2014-08-18 +# ============================================================================= + +# p +/- long + +StdLooseLambdaLDpLong = StdLooseLambdaDD.clone( 'StdLooseLambdaLDpLong' ) + +StdLooseLambdaLDpLong.Inputs = [ "Phys/StdLooseProtons/Particles", + "Phys/StdNoPIDsDownPions/Particles"] + +StdLooseLambdaLDpLong.DaughtersCuts = { "p+" : "(ISLONG) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)", + "pi-" : "(ISDOWN) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"} + +# p +/- down + +StdLooseLambdaLDpDown = StdLooseLambdaDD.clone( 'StdLooseLambdaLDpDown' ) + +StdLooseLambdaLDpDown.Inputs = [ "Phys/StdNoPIDsDownProtons/Particles", + "Phys/StdLoosePions/Particles" ] + +StdLooseLambdaLDpDown.DaughtersCuts = { "p+" : "(ISDOWN) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)", + "pi-" : "(ISLONG) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"} + +# Combination + +StdLooseLambdaLD = FilterDesktop("StdLooseLambdaLD", Code = "ALL") + +StdLooseLambdaLD.Inputs = [ "Phys/StdLooseLambdaLDpLong/Particles", + "Phys/StdLooseLambdaLDpDown/Particles" ] + +locations.update( updateDoD (StdLooseLambdaLDpLong) ) +locations.update( updateDoD (StdLooseLambdaLDpDown) ) + +locations.update( updateDoD (StdLooseLambdaLD) ) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py index 450c92bd9..e32f08f11 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseMergedPi0.py @@ -42,6 +42,3 @@ if '__main__' == __name__ : print __version__ print locationsDoD ( locations ) -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py index 34be80b83..92c52efc8 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseResolvedPi0.py @@ -57,7 +57,3 @@ if '__main__' == __name__ : print __author__ print __version__ print locationsDoD ( locations ) - -# ============================================================================= -# The END -# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py new file mode 100755 index 000000000..afca5a6c6 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseDetachedTau.py,v 1.0 2012-12-04 14:44:42 elsasser Exp $ +# ============================================================================= +## @file CommonParticles/StdTightDetachedTau.py +# configuration file for 'Standard Tight Detached Tau' +# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli +# @date 2012-12-02 +# Strongly modified 2012-14-01 by Giampiero Mancinelli +# Used to make the StdLooseDetachedTau3pi in Stripping20r0p3 +# Renamed tight afterward (in view of Stripping 21), in order to restore the +# previous loose selection (Sept 9th 2014) +# ============================================================================= +""" +Configuration file for 'Standard Tight Detached Tau' +""" +__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.0 $" +# ============================================================================= +__all__ = ( + 'StdTightDetachedTau3pi', + 'locations' + + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * + +## ============================================================================ +## create the algorithm - physical tau+ -> pi+ pi- pi+ +StdTightDetachedTau3pi = CombineParticles ( 'StdTightDetachedTau3pi' ) + +StdTightDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] + +#Build physical tau and tau+++ +StdTightDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] +StdTightDetachedTau3pi.DaughtersCuts = { + "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)", + "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)" + + } + + +StdTightDetachedTau3pi.CombinationCut = "(APT>800.*MeV) & ((AM>400.*MeV) & (AM<2100.*MeV)) & (AMAXDOCA('')<0.2*mm) & (ANUM(PT > 800*MeV) >= 1) " +StdTightDetachedTau3pi.MotherCut = "(PT>1000.*MeV) & (M>500.*MeV) & (M<2000.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 16) & (BPVVDCHI2>16) & (BPVVDRHO>0.1*mm) & (BPVVDRHO<7.0*mm) & (BPVVDZ>5.0*mm)" + +## configure Data-On-Demand service +locations = updateDoD ( StdTightDetachedTau3pi ) + + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From c676ea3453eccc2b81ed51381b852c2ac15dc832 Mon Sep 17 00:00:00 2001 From: acontu <acontu@4525493e-7705-40b1-a816-d608a930855b> Date: Fri, 8 May 2015 14:57:11 +0000 Subject: [PATCH 29/50] Created dbase for Stripping22 git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@187927 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/cmt/version.cmt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Phys/CommonParticles/cmt/version.cmt diff --git a/Phys/CommonParticles/cmt/version.cmt b/Phys/CommonParticles/cmt/version.cmt deleted file mode 100644 index f4786c6a1..000000000 --- a/Phys/CommonParticles/cmt/version.cmt +++ /dev/null @@ -1 +0,0 @@ -v8r19 -- GitLab From 93b393e1e79a1d4f91558651343331813a486d2e Mon Sep 17 00:00:00 2001 From: yamhis <yamhis> Date: Mon, 11 May 2015 14:24:55 +0000 Subject: [PATCH 30/50] Add Lambdasta git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@187989 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/doc/release.notes | 2 + .../CommonParticles/StandardIntermediate.py | 3 +- .../CommonParticles/StandardLambdastar.py | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100755 Phys/CommonParticles/python/CommonParticles/StandardLambdastar.py diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 4daa5ed24..aad4ebbe6 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,8 @@ ! !----------------------------------------------------------------------------- +! 2015-05-11 - Yasmine Amhis + - Added StandardLambdastar.py and stick it in Intermediate particles !========================= CommonParticles v8r19 2014-10-30 ========================= ! 2014-10-30 - Stefano Perazzini diff --git a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py index 8820ee512..6cdd718a9 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py @@ -42,7 +42,8 @@ from CommonParticles.StandardTau import * _locations.update ( locations ) from CommonParticles.StandardDipion import * _locations.update ( locations ) - +from CommonParticles.StandardLambdastar import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardLambdastar.py b/Phys/CommonParticles/python/CommonParticles/StandardLambdastar.py new file mode 100755 index 000000000..188ee21df --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardLambdastar.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdLooseLambdastar.py +# ============================================================================= +## @file CommonParticles/StdLooseLambdastar.py +# configuration file for 'Standard Loose Lambdastar' +# @author Yasmine Amhis +# @date 2015-05-06 +# ============================================================================= +""" +Configuration file for 'Standard Loose Lambdastar'. Useful for R_Lambda(*) +""" +__author__ = "Yasmine Amhis" +# ============================================================================= +__all__ = ( + 'StdLooseLambdastar2pK' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +## ============================================================================ +## create the algorithm +StdLooseLambdastar2pK = CombineParticles ("StdLooseLambdastar2pK") +StdLooseLambdastar2pK.Inputs = ["Phys/StdAllLooseKaons/Particles", + "Phys/StdAllLooseProtons/Particles"] +StdLooseLambdastar2pK.DecayDescriptor = "[Lambda(1520)0 -> p+ K-]cc" +StdLooseLambdastar2pK.CombinationCut = "(AM < 2600.*MeV) & (ADOCACHI2CUT(30, ''))" +StdLooseLambdastar2pK.MotherCut = "(VFASPF(VCHI2) < 25.)" + +## configure Data-On-Demand service +locations = updateDoD ( StdLooseLambdastar2pK ) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + -- GitLab From f53e965a5998a3ef6cc8310acde8d548548a1427 Mon Sep 17 00:00:00 2001 From: acontu <acontu> Date: Sat, 16 May 2015 21:00:29 +0000 Subject: [PATCH 31/50] Added StandardMuPi.py git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@188360 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/doc/release.notes | 3 ++ .../CommonParticles/StandardIntermediate.py | 2 ++ .../python/CommonParticles/StandardMuPi.py | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 Phys/CommonParticles/python/CommonParticles/StandardMuPi.py diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index aad4ebbe6..c3d473c6c 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,9 @@ ! !----------------------------------------------------------------------------- +! 2015-05-16 - Andrea Contu + - Added StandardMuPi.py + ! 2015-05-11 - Yasmine Amhis - Added StandardLambdastar.py and stick it in Intermediate particles !========================= CommonParticles v8r19 2014-10-30 ========================= diff --git a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py index 6cdd718a9..14e948ddc 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py @@ -44,6 +44,8 @@ from CommonParticles.StandardDipion import * _locations.update ( locations ) from CommonParticles.StandardLambdastar import * _locations.update ( locations ) +from CommonParticles.StandardMuPi import * +_locations.update ( locations ) # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StandardMuPi.py b/Phys/CommonParticles/python/CommonParticles/StandardMuPi.py new file mode 100644 index 000000000..6101b8e86 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StandardMuPi.py @@ -0,0 +1,31 @@ +""" +Configuration file for Standard All Loose Pi-Mu+ pair, potentially detached. +""" + +__author__ = 'Benoit VIAUD' +__date__ = '13/05/2015' + + +from Gaudi.Configuration import * +from Configurables import CombineParticles +from CommonParticles.Utils import * +import GaudiKernel.SystemOfUnits as Units + +############################## +# StdAllLooseMuPion # +############################## +StdAllLooseMuPion = CombineParticles("StdAllLooseMuPion") +StdAllLooseMuPion.DecayDescriptor = "rho(770)0 -> mu+ pi-" +StdAllLooseMuPion.Inputs = ["Phys/StdAllLooseMuons/Particles","Phys/StdAllLoosePions/Particles"] +StdAllLooseMuPion.DaughtersCuts = { "mu+" : "(PT>200*MeV) & (MIPCHI2DV(PRIMARY)>0.)", "pi-" : "(PT>200*MeV) & (MIPCHI2DV(PRIMARY)>0.)" } +StdAllLooseMuPion.CombinationCut = "(ADOCACHI2CUT(30,''))" +StdAllLooseMuPion.MotherCut = "(VFASPF(VCHI2)<25)" +locations = updateDoD(StdAllLooseMuPion) + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) -- GitLab From 793f36561183681857ffcbf05cb72d26bc4e6a24 Mon Sep 17 00:00:00 2001 From: rvazquez <rvazquez> Date: Fri, 29 May 2015 14:48:41 +0000 Subject: [PATCH 32/50] Prepared tag Phys/CommonParticles v8r20 git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@189237 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/doc/release.notes | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index e4b237fbe..094f67e48 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r19) +gaudi_subdir(CommonParticles v8r20) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index e5285d14e..79c5c2ec2 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r19 +version v8r20 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index c3d473c6c..4db44e3e4 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,8 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r20 2015-05-29 ========================= + ! 2015-05-16 - Andrea Contu - Added StandardMuPi.py -- GitLab From e05a6db12e7ea756794d8ee111e9d761c8e924bf Mon Sep 17 00:00:00 2001 From: jonrob <jonrob> Date: Sun, 2 Aug 2015 12:49:08 +0000 Subject: [PATCH 33/50] Add StdNoPIDsUpKaons.py git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@192938 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/doc/release.notes | 3 ++ .../python/CommonParticles/StandardKaons.py | 3 ++ .../CommonParticles/StdNoPIDsUpKaons.py | 47 +++++++++++++++++++ .../CommonParticles/StdNoPIDsUpPions.py | 6 +-- 4 files changed, 56 insertions(+), 3 deletions(-) create mode 100755 Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpKaons.py diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 4db44e3e4..1486a229a 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,9 @@ ! !----------------------------------------------------------------------------- +! 2015-08-02 - Chris Jones + - Add StdNoPIDsUpKaons.py + !========================= CommonParticles v8r20 2015-05-29 ========================= ! 2015-05-16 - Andrea Contu diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py index 054843512..cc20582ec 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py @@ -19,6 +19,9 @@ _locations = {} from CommonParticles.StdAllNoPIDsKaons import * _locations.update ( locations ) +from CommonParticles.StdNoPIDsUpKaons import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsKaons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpKaons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpKaons.py new file mode 100755 index 000000000..96a73ab4b --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpKaons.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# ============================================================================= +## @file CommonParticles/StdNoPIDsUpKaons.py +# configuration file for No PID Upstream Kaons +# @author Chris Jones christopher.rob.jones@cern.ch +# @date 20/01/2012 +# ============================================================================= +""" +Configuration file for No PID Upstream Kaons +""" +__author__ = "Chris Jones christopher.rob.jones@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsUpKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsUpKaons', + DecayDescriptor = 'Kaon' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm, trackTypes = ['Upstream'] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsUpKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py index 402236305..e64df24bb 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpPions.py @@ -24,9 +24,9 @@ from Configurables import NoPIDsParticleMaker from CommonParticles.Utils import * ## create the algorithm -algorithm = NoPIDsParticleMaker ( 'StdNoPIDsUpPions' , - DecayDescriptor = 'Pion' , - Particle = 'pion' ) +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsUpPions' , + DecayDescriptor = 'Pion' , + Particle = 'pion' ) # configure the track selector selector = trackSelector ( algorithm, trackTypes = ['Upstream'] ) -- GitLab From 060749e415b3c5ddfcb159509b28dcd861b09656 Mon Sep 17 00:00:00 2001 From: acontu <acontu> Date: Tue, 18 Aug 2015 10:11:01 +0000 Subject: [PATCH 34/50] Prepared tag Phys/CommonParticles v8r21 git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@193844 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/doc/release.notes | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 094f67e48..0f1a94a83 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r20) +gaudi_subdir(CommonParticles v8r21) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 79c5c2ec2..ac8cc9931 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r20 +version v8r21 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 1486a229a..d9bf3c978 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,8 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r21 2015-08-19 ========================= + ! 2015-08-02 - Chris Jones - Add StdNoPIDsUpKaons.py -- GitLab From 4e8418692d396bfbea56d0111f20193de2613350 Mon Sep 17 00:00:00 2001 From: jhe <jhe> Date: Thu, 20 Aug 2015 16:00:12 +0000 Subject: [PATCH 35/50] Fixed StdNoPIDsDownElectrons and added it into StandardElectrons git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@193992 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/doc/release.notes | 3 +++ .../python/CommonParticles/StandardElectrons.py | 3 +++ .../python/CommonParticles/StdNoPIDsDownElectrons.py | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index d9bf3c978..568658248 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,9 @@ ! !----------------------------------------------------------------------------- +! 2015-08-20 - Chris Jones + - Fixed StdNoPIDsDownElectrons and added it into StandardElectrons + !========================= CommonParticles v8r21 2015-08-19 ========================= ! 2015-08-02 - Chris Jones diff --git a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py index 2e0fbf269..9ce4e587f 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py @@ -22,6 +22,9 @@ _locations.update ( locations ) from CommonParticles.StdNoPIDsElectrons import * _locations.update ( locations ) +from CommonParticles.StdNoPIDsDownElectrons import * +_locations.update ( locations ) + from CommonParticles.StdAllLooseElectrons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py index abdb8ae37..b73ad39ff 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownElectrons.py @@ -14,7 +14,7 @@ __author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" # ============================================================================= __all__ = ( - 'StdNoPIDsElectrons' , + 'StdNoPIDsDownElectrons' , 'locations' ) # ============================================================================= -- GitLab From d2c0cda93d42c779a2d77935cb134946f1b05aa2 Mon Sep 17 00:00:00 2001 From: rvazquez <rvazquez> Date: Tue, 8 Sep 2015 15:46:25 +0000 Subject: [PATCH 36/50] Prepared tag Phys/CommonParticles v8r22 git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@194727 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/doc/release.notes | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 0f1a94a83..a8acf394c 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r21) +gaudi_subdir(CommonParticles v8r22) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index ac8cc9931..76223447c 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r21 +version v8r22 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 568658248..f5ac5e9ee 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,8 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r22 2015-09-08 ========================= + ! 2015-08-20 - Chris Jones - Fixed StdNoPIDsDownElectrons and added it into StandardElectrons -- GitLab From 17822b42fdf0be05cd9b3a271f3dc5642f1c3c3c Mon Sep 17 00:00:00 2001 From: acontu <acontu> Date: Thu, 10 Sep 2015 16:21:37 +0000 Subject: [PATCH 37/50] Fix to python/CommonParticles/StdLooseDalitzPi0.py git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@194851 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/doc/release.notes | 3 +++ .../python/CommonParticles/StdLooseDalitzPi0.py | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index f5ac5e9ee..f64c9f6ac 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -10,6 +10,9 @@ !========================= CommonParticles v8r22 2015-09-08 ========================= +! 2015-09-10 - Andrea Contu + - Fix to python/CommonParticles/StdLooseDalitzPi0.py + ! 2015-08-20 - Chris Jones - Fixed StdNoPIDsDownElectrons and added it into StandardElectrons diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py index af802ee54..422d99c96 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDalitzPi0.py @@ -46,10 +46,9 @@ StdLoosePi024e=pi024e from CommonParticles.StdLooseDiElectron import * pi0Dalitz = CombineParticles( "StdLooseDalitzPi0", DecayDescriptor = 'pi0 -> gamma gamma' ) pi0Dalitz.Inputs = ["Phys/StdLooseAllPhotons/Particles","Phys/StdDiElectronGamma/Particles"] -#pi0Dalitz.ParticleCombiners.update( {"" : "ParticleAdder"} ) -pi0Dalitz.ParticleCombiners.update( {"" : "LoKi::VertexFitter"} ) +pi0Dalitz.CombinationCut = "(AM < 200*MeV) & (1 == ACHILD(1,cnv)+ACHILD(2,cnv) )" pi0Dalitz.Preambulo += ["cnv = switch(INTES('StdLooseAllPhotons',False),1,0)"] -pi0Dalitz.MotherCut = " (MM < 170*MeV) & (MM > 90*MeV) & (1 == CHILD(1,cnv)+CHILD(2,cnv) )" +pi0Dalitz.MotherCut = " (MM < 170*MeV) & (MM > 90*MeV)" locations.update( updateDoD ( pi0Dalitz ) ) StdLooseDalitzPi0=pi0Dalitz -- GitLab From 3f9d008ab00bb4ab0aac552a39f59f7bb41286b8 Mon Sep 17 00:00:00 2001 From: rvazquez <rvazquez> Date: Sat, 14 Nov 2015 16:53:14 +0000 Subject: [PATCH 38/50] change chi2 and ghostprob cuts to Reco15 values git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@197629 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/doc/release.notes | 4 ++++ .../python/CommonParticles/StdLooseDetachedTau.py | 4 ++-- .../python/CommonParticles/StdLooseDetachedTauNonPhys.py | 2 +- Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py | 4 ++-- .../python/CommonParticles/StdTightDetachedTau.py | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index f64c9f6ac..3fc50c6b6 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,10 @@ ! !----------------------------------------------------------------------------- +! 2015-11-14 - Ricardo Vazquez Gomez + - Change the chi2 and ghostprob cut to Reco15 values for Taus and Dipion. + + !========================= CommonParticles v8r22 2015-09-08 ========================= ! 2015-09-10 - Andrea Contu diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py index 7b2f57f51..351ba3a5d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTau.py @@ -32,8 +32,8 @@ StdLooseDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ StdLooseDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdLooseDetachedTau3pi.DaughtersCuts = { - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", - "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)", + "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py index 80591705f..baaf44694 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDetachedTauNonPhys.py @@ -33,7 +33,7 @@ StdLooseDetachedTau3piNonPhys.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ StdLooseDetachedTau3piNonPhys.DecayDescriptors = ["[tau+ -> pi+ pi+ pi+]cc"] StdLooseDetachedTau3piNonPhys.DaughtersCuts = { - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } #Need an upper mass window of 100 MeV for background estimation diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py index adb473000..fbaf6a0ef 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDipion.py @@ -30,8 +30,8 @@ StdLooseDetachedDipion.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseDetachedDipion.DecayDescriptors = ["rho(770)0 -> pi+ pi-", "[rho(770)+ -> pi+ pi+]cc"] StdLooseDetachedDipion.DaughtersCuts = { - "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)", - "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.4) & (PIDK < 8)" + "pi+" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)", + "pi-" : "(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)" } #Need an upper mass window of 100 MeV for background estimation diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py b/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py index afca5a6c6..974dc23ec 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightDetachedTau.py @@ -36,8 +36,8 @@ StdTightDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ] #Build physical tau and tau+++ StdTightDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"] StdTightDetachedTau3pi.DaughtersCuts = { - "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)", - "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNpi > 0.55)" + "pi+" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PROBNNpi > 0.55)", + "pi-" : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PROBNNpi > 0.55)" } -- GitLab From 4bbc6cdf3093cf4c3bfcf9b4e3a2ef7205a89938 Mon Sep 17 00:00:00 2001 From: rvazquez <rvazquez> Date: Tue, 24 Nov 2015 10:47:03 +0000 Subject: [PATCH 39/50] Prepared tag Phys/CommonParticles v8r23 git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Stripping/trunk@198087 4525493e-7705-40b1-a816-d608a930855b --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/doc/release.notes | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index a8acf394c..833c277ae 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r22) +gaudi_subdir(CommonParticles v8r23) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 76223447c..6a7492d70 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r22 +version v8r23 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 3fc50c6b6..7715ae619 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,8 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r23 2015-11-24 ========================= + ! 2015-11-14 - Ricardo Vazquez Gomez - Change the chi2 and ghostprob cut to Reco15 values for Taus and Dipion. -- GitLab From 6e020bbb9e878fa26dc21ff56014a745d6fd3c04 Mon Sep 17 00:00:00 2001 From: Michel De Cian <michel.de.cian@cern.ch> Date: Mon, 24 Oct 2016 11:18:06 +0200 Subject: [PATCH 40/50] Added 'StdAllNoPIDsVeloPions' to make particles out of Velo tracks --- .../python/CommonParticles/StandardPions.py | 3 ++ .../CommonParticles/StdAllNoPIDsVeloPions.py | 54 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py diff --git a/Phys/CommonParticles/python/CommonParticles/StandardPions.py b/Phys/CommonParticles/python/CommonParticles/StandardPions.py index f36008eb9..3246ad276 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardPions.py @@ -58,6 +58,9 @@ _locations.update ( locations ) from CommonParticles.StdTightANNUpPions import * _locations.update ( locations ) +from CommonParticles.StdAllNoPIDsVeloPions import * +_locations.update ( locations ) + # redefine the locations locations = _locations diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py new file mode 100644 index 000000000..b4734b635 --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdAllNoPIDsPions.py +# configuration file for 'Standard NoPIDs Pions' +# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl +# @date 2009-01-14 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs pions from velo tracks' +""" +__author__ = "Michel De Cian michel.de.cian@cern.ch" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" +# ============================================================================= +__all__ = ( + 'StdAllNoPIDsVeloPions' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker, ChargedProtoParticleMaker +from CommonParticles.Utils import * + +## create the algorithm +algorithmPP = ChargedProtoParticleMaker( 'VeloPP', Output = "Rec/ProtoP/VeloCharged", TrackSelectorType = 'TrackSelector') + +algorithm = NoPIDsParticleMaker ( 'StdAllNoPIDsVeloPions' , + Particle = 'pion', + Input = "Rec/ProtoP/VeloCharged") + +# configure the track selector +selectorPP = trackSelector ( algorithmPP, trackTypes = [ "Velo" ] ) +selector = trackSelector ( algorithm, trackTypes = [ "Velo" ] ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +DataOnDemandSvc().AlgMap.update({ 'Rec/ProtoP/VeloCharged' : algorithmPP.getFullName() }) + +## finally: define the symbol +StdAllNoPIDsVeloPions = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From 200fe558436c9d58c0291600f995b3ccd06a5b40 Mon Sep 17 00:00:00 2001 From: Michel De Cian <michel.de.cian@cern.ch> Date: Mon, 24 Oct 2016 15:06:58 +0200 Subject: [PATCH 41/50] Added correct author for 'StdAllNoPIDsVeloPions.py' --- .../python/CommonParticles/StdAllNoPIDsVeloPions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py index b4734b635..d1ccf6f77 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py +++ b/Phys/CommonParticles/python/CommonParticles/StdAllNoPIDsVeloPions.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # ============================================================================= -# $Id: StdAllNoPIDsPions.py,v 1.5 2009-07-01 18:42:29 jonrob Exp $ +# $Id: StdAllNoPIDsVeloPions.py,v 1.0 2016-10-24 15:01:01 decianm Exp $ # ============================================================================= -## @file CommonParticles/StdAllNoPIDsPions.py -# configuration file for 'Standard NoPIDs Pions' -# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl -# @date 2009-01-14 +## @file CommonParticles/StdAllNoPIDsVeloPions.py +# configuration file for 'Standard NoPIDs Velo Pions' +# @author Michel De Cian, michel.de.cian@cern.ch +# @date 2016-10-24 # ============================================================================= """ Configuration file for 'Standard NoPIDs pions from velo tracks' -- GitLab From 3d39558e11c6fb35d4a1008be803acfd7f475c47 Mon Sep 17 00:00:00 2001 From: Olli Lupton <oliver.lupton@cern.ch> Date: Fri, 4 Nov 2016 15:10:29 +0100 Subject: [PATCH 42/50] Add StdNoPIDsDownKaons. --- Phys/CommonParticles/doc/release.notes | 3 ++ .../python/CommonParticles/StandardKaons.py | 3 ++ .../CommonParticles/StdNoPIDsDownKaons.py | 52 +++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownKaons.py diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 7715ae619..56c8c4f9e 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,9 @@ ! !----------------------------------------------------------------------------- +| 2016-11-04 - Olli Lupton + - Add a container of downstream kaons without PID requirements (StdNoPIDsDownKaons). + !========================= CommonParticles v8r23 2015-11-24 ========================= ! 2015-11-14 - Ricardo Vazquez Gomez diff --git a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py index cc20582ec..b4417f285 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardKaons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardKaons.py @@ -22,6 +22,9 @@ _locations.update ( locations ) from CommonParticles.StdNoPIDsUpKaons import * _locations.update ( locations ) +from CommonParticles.StdNoPIDsDownKaons import * +_locations.update ( locations ) + from CommonParticles.StdNoPIDsKaons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownKaons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownKaons.py new file mode 100644 index 000000000..56197380f --- /dev/null +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsDownKaons.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# ============================================================================= +# $Id: StdNoPIDsDownKaons.py,v 1.4 2009-07-01 18:42:29 jonrob Exp $ +# ============================================================================= +## @file CommonParticles/StdNoPIDsDownKaons.py +# configuration file for 'Standard NoPIDs Downstream Kaons' +# @author Olli LUPTON oliver.lupton@cern.ch +# @date 2016-11-03 +# ============================================================================= +""" +Configuration file for 'Standard NoPIDs Downstream Kaons' +""" +__author__ = "Olli Lupton <oliver.lupton@cern.ch>" +__version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.4 $" +# ============================================================================= +__all__ = ( + 'StdNoPIDsDownKaons' , + 'locations' + ) +# ============================================================================= +from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker + +from CommonParticles.Utils import * + +## create the algorithm +algorithm = NoPIDsParticleMaker ( 'StdNoPIDsDownKaons' , + DecayDescriptor = 'Kaon' , + Particle = 'kaon' ) + +# configure the track selector +selector = trackSelector ( algorithm, + trackTypes = ['Downstream'], + cuts = { "Chi2Cut" : [0,10] } ) + +## configure Data-On-Demand service +locations = updateDoD ( algorithm ) + +## finally: define the symbol +StdNoPIDsDownKaons = algorithm + +## ============================================================================ +if '__main__' == __name__ : + + print __doc__ + print __author__ + print __version__ + print locationsDoD ( locations ) + +# ============================================================================= +# The END +# ============================================================================= -- GitLab From 7ec013ba3c7f07e9cdcd750d1a5e87ef30b705c3 Mon Sep 17 00:00:00 2001 From: Michel De Cian <michel.de.cian@cern.ch> Date: Wed, 30 Nov 2016 21:48:22 +0100 Subject: [PATCH 43/50] Fixed StdNoPIDsUpElectrons --- .../python/CommonParticles/StandardElectrons.py | 3 +++ .../python/CommonParticles/StdNoPIDsUpElectrons.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py index 9ce4e587f..2daa3af66 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardElectrons.py @@ -25,6 +25,9 @@ _locations.update ( locations ) from CommonParticles.StdNoPIDsDownElectrons import * _locations.update ( locations ) +from CommonParticles.StdNoPIDsUpElectrons import * +_locations.update ( locations ) + from CommonParticles.StdAllLooseElectrons import * _locations.update ( locations ) diff --git a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py index b3a53979e..1c6d26c29 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py +++ b/Phys/CommonParticles/python/CommonParticles/StdNoPIDsUpElectrons.py @@ -14,7 +14,7 @@ __author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch" __version__ = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $" # ============================================================================= __all__ = ( - 'StdNoPIDsElectrons' , + 'StdNoPIDsUpElectrons' , 'locations' ) # ============================================================================= -- GitLab From c25d9ec6b52becdf41f7b8d302dc9cfb6dbbba76 Mon Sep 17 00:00:00 2001 From: Chitsanu Khurewathanakul <chitsanu.khurewathanakul@cern.ch> Date: Sun, 11 Dec 2016 00:43:46 +0100 Subject: [PATCH 44/50] Fix unlink particles in commonparticles --- .../python/CommonParticles/StdLooseD02KsHH.py | 6 ++++-- .../python/CommonParticles/StdLooseDplus.py | 18 ++++++++++-------- .../python/CommonParticles/StdTightDplus.py | 9 ++++++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py b/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py index 1c2fb339c..44d727c9e 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseD02KsHH.py @@ -23,6 +23,8 @@ from Gaudi.Configuration import * from Configurables import CombineParticles from CommonParticles.Utils import * +locations = {} + ## ============================================================================ ## create the algorithm ########################################################################################## @@ -41,7 +43,7 @@ StdLooseD02KsPiPi.CombinationCut = "(ADAMASS('D0')<80*MeV) & (APT>1800*MeV)" StdLooseD02KsPiPi.MotherCut = "(VFASPF(VCHI2/VDOF)<10) & (MIPCHI2DV(PRIMARY)>1)" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseD02KsPiPi ) +locations.update(updateDoD ( StdLooseD02KsPiPi )) ########################################################################################## @@ -59,7 +61,7 @@ StdLooseD02KsKK.CombinationCut = "(ADAMASS('D0')<80) & (APT>1500*MeV)" StdLooseD02KsKK.MotherCut = "(VFASPF(VCHI2/VDOF)<10) & (MIPCHI2DV(PRIMARY)>0.49)" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseD02KsKK ) +locations.update(updateDoD ( StdLooseD02KsKK )) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py index 35eaaaf45..9d4c413ca 100755 --- a/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdLooseDplus.py @@ -29,6 +29,8 @@ from Gaudi.Configuration import * from Configurables import CombineParticles from CommonParticles.Utils import * +locations = {} + ## ============================================================================ ## create the algorithm StdLooseDplus2KPiPi = CombineParticles ( 'StdLooseDplus2KPiPi' ) @@ -48,33 +50,33 @@ StdLooseDplus2KPiPi.CombinationCut = "((AM>1760.*MeV) & (AM<2080.*MeV) & ((APT>1 StdLooseDplus2KPiPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1770.*MeV) & (M < 2070.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseDplus2KPiPi ) +locations.update(updateDoD ( StdLooseDplus2KPiPi )) ########################################################################################## # D+ -> K K Pi is a clone of D+ -> K Pi Pi # StdLooseDplus2KKPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KKPi") StdLooseDplus2KKPi.DecayDescriptor = "[D+ -> K- K+ pi+]cc" -locations = updateDoD ( StdLooseDplus2KKPi ) +locations.update(updateDoD ( StdLooseDplus2KKPi )) ########################################################################################## # D+ -> 3 pi is a clone of D+ -> K Pi Pi # StdLooseDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2PiPiPi") StdLooseDplus2PiPiPi.Inputs = [ "Phys/StdLoosePions/Particles" ] StdLooseDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" -locations = updateDoD ( StdLooseDplus2PiPiPi ) +locations.update(updateDoD ( StdLooseDplus2PiPiPi )) ########################################################################################## # D_s+ -> K K Pi is a clone of D+ -> K Pi Pi # StdLooseDsplus2KKPi = StdLooseDplus2KPiPi.clone("StdLooseDsplus2KKPi") StdLooseDsplus2KKPi.DecayDescriptor = "[D_s+ -> K- K+ pi+]cc" -locations = updateDoD ( StdLooseDsplus2KKPi ) +locations.update(updateDoD ( StdLooseDsplus2KKPi )) ########################################################################################## # Also need the opposite sign pions mode for the Ds # StdLooseDplus2KPiPiOppSignPi = StdLooseDplus2KPiPi.clone("StdLooseDplus2KPiPiOppSignPi") StdLooseDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc" -locations = updateDoD ( StdLooseDplus2KPiPiOppSignPi ) +locations.update(updateDoD ( StdLooseDplus2KPiPiOppSignPi )) ######################################################################################## @@ -93,7 +95,7 @@ StdLooseDplus2KKK.CombinationCut = "(AM>1760.*MeV) & (AM<2080.*MeV) & (ACHILD(P StdLooseDplus2KKK.MotherCut = "(PT > 1000) & (VFASPF(VCHI2/VDOF) < 10.0) & (BPVDIRA > 0.98) & (BPVIPCHI2() < 15.0) & (VFASPF(VMINVDCHI2DV(PRIMARY)) > 100.0)" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseDplus2KKK ) +locations.update(updateDoD ( StdLooseDplus2KKK )) @@ -116,7 +118,7 @@ StdLooseDsplus2KKPiOppSign.CombinationCut = "(AM>1760.*MeV) & (AM<2080.*MeV) & ( StdLooseDsplus2KKPiOppSign.MotherCut = "(PT > 1000) & (VFASPF(VCHI2/VDOF) < 10.0) & (BPVDIRA > 0.98) & (BPVIPCHI2() < 15.0) & (VFASPF(VMINVDCHI2DV(PRIMARY)) > 100.0)" ## configure Data-On-Demand service -locations = updateDoD ( StdLooseDsplus2KKPiOppSign ) +locations.update(updateDoD ( StdLooseDsplus2KKPiOppSign )) ########################################################################################## @@ -145,7 +147,7 @@ StdLooseDplus2hhh.Preambulo = [ "mpipipi = AWM ('pi-' , 'pi+', 'pi+' ) " , "mKpipiDCS1 = AWM ( 'pi-' , 'K+' , 'pi+' )", "mKpipiDCS2 = AWM ( 'pi-' , 'pi+', 'K+' )" ] ## configure Data-On-Demand service -locations = updateDoD (StdLooseDplus2hhh) +locations.update(updateDoD (StdLooseDplus2hhh) ) ## ============================================================================ if '__main__' == __name__ : diff --git a/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py b/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py index e44590612..8af3fc563 100644 --- a/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py +++ b/Phys/CommonParticles/python/CommonParticles/StdTightDplus.py @@ -16,6 +16,9 @@ __all__ = ( from Gaudi.Configuration import * from Configurables import CombineParticles from CommonParticles.Utils import * + +locations = {} + ## ============================================================================ StdTightDplus2KPiPiOppSignPi = CombineParticles ( 'StdTightDplus2KPiPiOppSignPi') StdTightDplus2KPiPiOppSignPi.Inputs = [ "Phys/StdLooseKaons/Particles", @@ -29,7 +32,7 @@ StdTightDplus2KPiPiOppSignPi.DaughtersCuts = { StdTightDplus2KPiPiOppSignPi.CombinationCut = "((AM>1760.*MeV) & (AM<2080.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))" StdTightDplus2KPiPiOppSignPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1770.*MeV) & (M < 2070.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" -locations = updateDoD ( StdTightDplus2KPiPiOppSignPi ) +locations.update(updateDoD ( StdTightDplus2KPiPiOppSignPi )) ## =========================================================================== StdVeryTightDsplus2KKPi = CombineParticles( 'StdVeryTightDsplus2KKPi' ) @@ -41,7 +44,7 @@ StdVeryTightDsplus2KKPi.DaughtersCuts = { } StdVeryTightDsplus2KKPi.CombinationCut = "((AM>1900.*MeV) & (AM<2040.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))" StdVeryTightDsplus2KKPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1920.*MeV) & (M < 2020.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" -locations = updateDoD ( StdVeryTightDsplus2KKPi ) +locations.update(updateDoD ( StdVeryTightDsplus2KKPi )) ########################################################################################## # D+ -> 3 pi is a clone of D+ -> K Pi Pi @@ -51,7 +54,7 @@ StdTightDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdTightDplus2PiPiPi") StdTightDplus2PiPiPi.Inputs = [ "Phys/StdLoosePions/Particles" ] StdTightDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc" StdTightDplus2PiPiPi.DaughtersCuts = {"pi+" : "(P > 2*GeV) & ((PIDK-PIDpi) < 3.) & ((MIPCHI2DV(PRIMARY)) > 6.0 )"} -locations = updateDoD ( StdTightDplus2PiPiPi ) +locations.update(updateDoD ( StdTightDplus2PiPiPi )) ########################################################################################## ## ============================================================================ -- GitLab From 25fde55235f14bde16f26c8a82e2dec509bd2994 Mon Sep 17 00:00:00 2001 From: Ricardo Vazquez Gomez <ricardo.vazquez.gomez@cern.ch> Date: Mon, 19 Dec 2016 10:59:38 +0100 Subject: [PATCH 45/50] Update CMakeLists.txt for S27 --- Phys/CommonParticles/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index 833c277ae..ff5742469 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r23) +gaudi_subdir(CommonParticles v8r24) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) -- GitLab From fac1159039068cb030b4b0529b70e1acf1c56187 Mon Sep 17 00:00:00 2001 From: Ricardo Vazquez Gomez <ricardo.vazquez.gomez@cern.ch> Date: Mon, 19 Dec 2016 11:00:46 +0100 Subject: [PATCH 46/50] Update requirements for S27 --- Phys/CommonParticles/cmt/requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 6a7492d70..40678f479 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r23 +version v8r24 #============================================================================ # Structure, i.e. directories to process. -- GitLab From ed30c140d764986c71e4cf90392e3c5f611b5485 Mon Sep 17 00:00:00 2001 From: Ricardo Vazquez Gomez <ricardo.vazquez.gomez@cern.ch> Date: Mon, 19 Dec 2016 11:38:02 +0100 Subject: [PATCH 47/50] prepare v8r24 for S27 --- Phys/CommonParticles/doc/release.notes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index 56c8c4f9e..f619f7562 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,8 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r24 2016-12-19 ========================= + | 2016-11-04 - Olli Lupton - Add a container of downstream kaons without PID requirements (StdNoPIDsDownKaons). -- GitLab From 24f0e120d81a76e488c2dd2949518ffe38e77f19 Mon Sep 17 00:00:00 2001 From: Chitsanu Khurewathanakul <chitsanu.khurewathanakul@cern.ch> Date: Fri, 23 Dec 2016 18:33:32 +0100 Subject: [PATCH 48/50] Fix unlinked StandardTauNonPhys --- .../python/CommonParticles/StandardIntermediate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py index 14e948ddc..e92e3843d 100755 --- a/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py +++ b/Phys/CommonParticles/python/CommonParticles/StandardIntermediate.py @@ -40,6 +40,8 @@ from CommonParticles.StandardLambdac import * _locations.update ( locations ) from CommonParticles.StandardTau import * _locations.update ( locations ) +from CommonParticles.StandardTauNonPhys import * +_locations.update ( locations ) from CommonParticles.StandardDipion import * _locations.update ( locations ) from CommonParticles.StandardLambdastar import * -- GitLab From cb3d91df69f929033462fc3ef09ee50f3a90c6b8 Mon Sep 17 00:00:00 2001 From: malexand <michael.alexander@glasgow.ac.uk> Date: Tue, 31 Jan 2017 18:35:12 +0100 Subject: [PATCH 49/50] updating package revs. --- Phys/CommonParticles/CMakeLists.txt | 2 +- Phys/CommonParticles/cmt/requirements | 2 +- Phys/CommonParticles/doc/release.notes | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Phys/CommonParticles/CMakeLists.txt b/Phys/CommonParticles/CMakeLists.txt index ff5742469..d46f41431 100644 --- a/Phys/CommonParticles/CMakeLists.txt +++ b/Phys/CommonParticles/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # Package: CommonParticles ################################################################################ -gaudi_subdir(CommonParticles v8r24) +gaudi_subdir(CommonParticles v8r25) gaudi_depends_on_subdirs(Phys/DaVinciKernel Tr/TrackTools) diff --git a/Phys/CommonParticles/cmt/requirements b/Phys/CommonParticles/cmt/requirements index 40678f479..af87a4627 100755 --- a/Phys/CommonParticles/cmt/requirements +++ b/Phys/CommonParticles/cmt/requirements @@ -6,7 +6,7 @@ # http://cern.ch/lhcb-comp/Support/html/new_structure.pdf #============================================================================ package CommonParticles -version v8r24 +version v8r25 #============================================================================ # Structure, i.e. directories to process. diff --git a/Phys/CommonParticles/doc/release.notes b/Phys/CommonParticles/doc/release.notes index f619f7562..ab130a96a 100755 --- a/Phys/CommonParticles/doc/release.notes +++ b/Phys/CommonParticles/doc/release.notes @@ -8,6 +8,11 @@ ! !----------------------------------------------------------------------------- +!========================= CommonParticles v8r25 2017-01-31 ========================= + +! 2016-12-23 - Chitsanu Khurewathanakul + - Fix unlinked StandardTauNonPhys + !========================= CommonParticles v8r24 2016-12-19 ========================= | 2016-11-04 - Olli Lupton -- GitLab From 1d02a925f89abbe0dc4b8993579df89204f6cb63 Mon Sep 17 00:00:00 2001 From: Rosen Matev <rosen.matev@cern.ch> Date: Sat, 11 Feb 2017 11:34:03 +0100 Subject: [PATCH 50/50] Add moved packages to PhysSys/CMakeLists.txt --- PhysSys/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/PhysSys/CMakeLists.txt b/PhysSys/CMakeLists.txt index be5a27c86..eddb61d87 100644 --- a/PhysSys/CMakeLists.txt +++ b/PhysSys/CMakeLists.txt @@ -5,6 +5,7 @@ gaudi_subdir(PhysSys v23r1) gaudi_depends_on_subdirs(Kernel/SelectionLine Phys/BBDecTreeTool + Phys/CommonParticles/ Phys/DaVinciInterfaces Phys/DaVinciKernel Phys/DaVinciMCKernel -- GitLab