From 0638c1fd22c62b74a2f6401a379c6f1eeba841d3 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Thu, 30 Mar 2023 09:38:14 +0200 Subject: [PATCH 1/8] Add first CI test of flake8 linting. --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57454c2f4..685441f6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,3 +13,13 @@ check-copyright: script: - curl -o check_copyright.py "https://gitlab.cern.ch/lhcb-core/LbDevTools/raw/master/LbDevTools/SourceTools.py?inline=false" - python check_copyright.py origin/2018-patches + +python-linting: + stage: check + tags: + - cvmfs + script: + - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh + # Only run the pyflakes linter and a few select pycodestyle errors + - flake8 $(find . -name '*.py') + -- GitLab From de78f2a49fdf4488d3d38502b2c218d1f4331a8c Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Thu, 30 Mar 2023 09:40:51 +0200 Subject: [PATCH 2/8] Change stage of flake8 linting CI test so that it runs. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 685441f6c..5853534fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ check-copyright: - python check_copyright.py origin/2018-patches python-linting: - stage: check + stage: .pre tags: - cvmfs script: -- GitLab From ea354931b4422eb2942d5b1f87cbe57129401787 Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Thu, 30 Mar 2023 10:05:15 +0200 Subject: [PATCH 3/8] Play around with flake8 options. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5853534fa..5d1523889 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,6 @@ python-linting: - cvmfs script: - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh - # Only run the pyflakes linter and a few select pycodestyle errors - - flake8 $(find . -name '*.py') + # Only run the pyflakes linter and a few select pycodestyle errors, ignore line too long warnings. + - flake8 --extend0ignore E501 $(find . -name '*.py') -- GitLab From a64f2b23509ae2a1d498d318f2507cb719d4cfef Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Thu, 30 Mar 2023 10:07:33 +0200 Subject: [PATCH 4/8] Correctly do options. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d1523889..75c4652a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,5 +21,5 @@ python-linting: script: - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh # Only run the pyflakes linter and a few select pycodestyle errors, ignore line too long warnings. - - flake8 --extend0ignore E501 $(find . -name '*.py') + - flake8 --extend-ignore E501 $(find . -name '*.py') -- GitLab From b41a87fbb764ed052edf4007956b5fc59fb9b2be Mon Sep 17 00:00:00 2001 From: ngrieser <ngrieser@cern.ch> Date: Thu, 30 Mar 2023 10:21:29 +0200 Subject: [PATCH 5/8] Ignore star import warnings. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75c4652a2..8658bdc6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,5 +21,5 @@ python-linting: script: - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh # Only run the pyflakes linter and a few select pycodestyle errors, ignore line too long warnings. - - flake8 --extend-ignore E501 $(find . -name '*.py') + - flake8 --extend-ignore E501,F405 $(find . -name '*.py') -- GitLab From 1f1c3a4fbc8d49d1fd96d57d6127793b740a798d Mon Sep 17 00:00:00 2001 From: erodrigu <eduardo.rodrigues@cern.ch> Date: Fri, 31 Mar 2023 18:22:31 +0200 Subject: [PATCH 6/8] Ran autoflake8 for unused imports/variables --- .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping24r2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping25/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping27/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping28r2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping28r2p1/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping30r2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping30r3/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping31r1/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping31r2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping33r2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping34/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping34r0p1/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping34r0p2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping35r2/CommonParticles/Utils.py | 1 - .../CommonParticles/StdLooseDetachedKpi.py | 1 - .../CommonParticles/StdLooseDetachedKstar.py | 1 - .../StdVeryLooseDetachedKstar.py | 1 - .../Stripping35r3/CommonParticles/Utils.py | 1 - .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2EtacMu.py | 3 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2KsKpi.py | 3 +- .../StrippingCcbar2LambdaLambda.py | 4 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 3 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingXib2LcKpiDecays.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V04h.py | 5 +- .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCalib/StrippingCaloPID.py | 8 +- .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiGamma.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingDst2D0Pi.py | 5 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHGamma.py | 7 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KPiPiMuNu.py | 5 +- .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 5 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 2 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXic2LambdaKPi.py | 2 - .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonConvertedPhoton.py | 2 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonGammaHadron.py | 5 +- .../StrippingIFT/StrippingHeavyIonMiniBias.py | 1 - .../StrippingHeavyIonOpenCharm.py | 4 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingHeavyIonSingleElectron.py | 2 +- .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingConvertedPhoton.py | 5 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping24r2/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../depreciated/StrippingZ02nH.py | 1 - .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 5 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 1 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 49 +------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonOpenCharm.py | 2 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingHeavyIonTrackEffMuonTT.py | 7 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonOpenCharm.py | 2 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingHeavyIonTrackEffMuonTT.py | 7 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2EtacMu.py | 3 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2KsKpi.py | 3 +- .../StrippingCcbar2LambdaLambda.py | 4 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 3 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingXib2LcKpiDecays.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V04h.py | 5 +- .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCalib/StrippingCaloPID.py | 8 +- .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiGamma.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingDst2D0Pi.py | 5 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHGamma.py | 7 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KPiPiMuNu.py | 5 +- .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 5 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 2 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXic2LambdaKPi.py | 2 - .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonConvertedPhoton.py | 2 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonGammaHadron.py | 5 +- .../StrippingIFT/StrippingHeavyIonMiniBias.py | 1 - .../StrippingHeavyIonOpenCharm.py | 4 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingHeavyIonSingleElectron.py | 2 +- .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingConvertedPhoton.py | 5 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping28r2/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../depreciated/StrippingZ02nH.py | 1 - .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 5 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 1 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 49 +------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingBd2JpsieeKSFullDST.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2D0X0.py | 10 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2EtacMu.py | 3 +- .../StrippingBandQ/StrippingBc2EtacSL.py | 3 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2KsKpi.py | 3 +- .../StrippingCcbar2LambdaLambda.py | 6 +- .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 3 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingLb2L0X3872.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingOniaPhotoProduction.py | 1 - .../StrippingOniaPhotoProductionPrescaled.py | 1 - .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingB2LambdapppLines.py | 15 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2KSh.py | 3 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2p3h_raw.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingBnoC/StrippingXib2LbXLb2ph.py | 3 +- .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingD02KPiPi0ForPid.py | 5 +- .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingDst2D0Pi.py | 5 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingEta2MuMuGamma.py | 6 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingNoPIDDstarWithD02RSKPi_Brem.py | 15 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingCharm/StrippingBs2st2pKpipipi.py | 1 - .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharmedBaryonSL.py | 8 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KPiPiMuNu.py | 5 +- .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 2 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingLambdacForNeutronPID.py | 4 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingXcpToLambdaKSHp.py | 2 - .../StrippingCharm/StrippingXcpToXiPipHp.py | 4 +- .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicToSigmaKPi.py | 2 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingCharm/StrippingXiccSL.py | 9 +- .../StrippingIFT/StrippingHeL2ppppi.py | 1 - .../StrippingIFT/StrippingHeMedian.py | 5 +- .../StrippingIFT/StrippingHeNOverflows.py | 5 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 7 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingIFT/StrippingLb2V0pphh.py | 1 - .../StrippingIFT/StrippingLb2dpX.py | 2 - .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingALP2TauTau.py | 4 +- .../StrippingQEE/StrippingB2EHNLLines.py | 3 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingB2MuHNLLines.py | 3 +- .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Hadrons.py | 3 +- .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLambdaDecaysDM.py | 6 +- .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2DibaryonMuMu.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KSKSMuMu.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2LLXBDTSS.py | 8 +- .../StrippingRD/StrippingB2LLXBDT_Calib.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2OCMuMu.py | 8 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XMuTauMuonic.py | 2 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingB2XTauTauMuonic.py | 2 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBaryonicLFV.py | 4 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2MajoLep.py | 12 +- .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 3 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingMultiLepton.py | 7 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareBaryonicMuMu.py | 4 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingS2Hyperons.py | 4 - .../StrippingRD/StrippingSb2PKMuXPi.py | 3 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 12 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2Invis.py | 11 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 133 ++++++------------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingSL/StrippingBc2Bs.py | 8 -- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/StrippingSemilepISR.py | 2 +- .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2DhhhLTUB.py | 1 - .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingB2OC/StrippingDstarD02Kpipi0.py | 7 +- .../StrippingB2OC/StrippingLb2Lcpi.py | 7 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 36 +++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXic2HHHOld.py | 6 +- .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingB2CharmlessQuasi2Body.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 6 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 5 +- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 16 +-- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 16 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 6 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonIncLcForProtonPID.py | 5 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 7 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../Stripping30r2/StrippingIFT/__init__.py | 11 -- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingHighPtTau.py | 2 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping30r2/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 3 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 15 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 28 +--- .../StrippingSL/StrippingB2XuMuNu.py | 12 +- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2DhhhLTUB.py | 1 - .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingB2OC/StrippingDstarD02Kpipi0.py | 7 +- .../StrippingB2OC/StrippingLb2Lcpi.py | 7 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 36 +++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXic2HHHOld.py | 6 +- .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingB2CharmlessQuasi2Body.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 6 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 5 +- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 16 +-- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 16 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 6 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonIncLcForProtonPID.py | 5 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 7 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../Stripping30r3/StrippingIFT/__init__.py | 11 -- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingHighPtTau.py | 2 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping30r3/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 3 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 15 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 28 +--- .../StrippingSL/StrippingB2XuMuNu.py | 12 +- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2DhhhLTUB.py | 1 - .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingB2OC/StrippingDstarD02Kpipi0.py | 7 +- .../StrippingB2OC/StrippingLb2Lcpi.py | 7 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 6 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 16 +-- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 16 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 4 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 7 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../Stripping31r1/StrippingIFT/__init__.py | 10 -- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 4 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingHighPtTau.py | 2 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping31r1/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 3 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 15 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 28 +--- .../StrippingSL/StrippingB2XuMuNu.py | 12 +- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2DhhhLTUB.py | 1 - .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingB2OC/StrippingDstarD02Kpipi0.py | 7 +- .../StrippingB2OC/StrippingLb2Lcpi.py | 7 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 36 +++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXic2HHHOld.py | 6 +- .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingB2CharmlessQuasi2Body.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 6 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 5 +- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 16 +-- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 16 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 6 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 7 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../Stripping31r2/StrippingIFT/__init__.py | 11 -- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingHighPtTau.py | 2 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping31r2/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 3 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 15 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 28 +--- .../StrippingSL/StrippingB2XuMuNu.py | 12 +- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingCcbar2LambdaLambda.py | 4 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 5 +- .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHGamma.py | 7 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 4 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 7 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping33r2/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 5 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 1 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 49 +------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 21 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 12 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 16 +-- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 16 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 4 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../Stripping34/StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping34/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../Stripping34/StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 15 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../Stripping34/StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 29 +--- .../StrippingSL/StrippingB2XuMuNu.py | 12 +- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingCcbar2LambdaLambda.py | 4 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 5 +- .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 16 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHGamma.py | 7 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 4 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonConvertedPhoton.py | 2 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonGammaHadron.py | 5 +- .../StrippingIFT/StrippingHeavyIonMiniBias.py | 1 - .../StrippingHeavyIonOpenCharm.py | 4 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingHeavyIonSingleElectron.py | 2 +- .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 5 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 1 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 49 +------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingBd2JpsieeKSFullDST.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2EtacMu.py | 3 +- .../StrippingBandQ/StrippingBc2EtacSL.py | 3 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2KsKpi.py | 3 +- .../StrippingCcbar2LambdaLambda.py | 6 +- .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 3 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingLb2L0X3872.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingB2LambdapppLines.py | 15 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2KSh.py | 3 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2p3h_raw.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingDst2D0Pi.py | 5 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingEta2MuMuGamma.py | 6 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingNoPIDDstarWithD02RSKPi_Brem.py | 15 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingCharm/StrippingBs2st2pKpipipi.py | 1 - .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharmedBaryonSL.py | 6 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KPiPiMuNu.py | 5 +- .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 2 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingLambdacForNeutronPID.py | 4 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingXcpToLambdaKSHp.py | 2 - .../StrippingCharm/StrippingXcpToXiPipHp.py | 4 +- .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicToSigmaKPi.py | 2 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingCharm/StrippingXiccSL.py | 9 +- .../StrippingIFT/StrippingHeL2ppppi.py | 1 - .../StrippingIFT/StrippingHeMedian.py | 5 +- .../StrippingIFT/StrippingHeNOverflows.py | 5 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 7 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingIFT/StrippingLb2V0pphh.py | 1 - .../StrippingIFT/StrippingLb2dpX.py | 2 - .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingALP2TauTau.py | 4 +- .../StrippingQEE/StrippingB2EHNLLines.py | 3 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingB2MuHNLLines.py | 3 +- .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Hadrons.py | 3 +- .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLambdaDecaysDM.py | 6 +- .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2DibaryonMuMu.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KSKSMuMu.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2LLXBDTSS.py | 8 +- .../StrippingRD/StrippingB2LLXBDT_Calib.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2OCMuMu.py | 8 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XMuTauMuonic.py | 2 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingB2XTauTauMuonic.py | 2 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBaryonicLFV.py | 4 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2MajoLep.py | 12 +- .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 3 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingMultiLepton.py | 7 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareBaryonicMuMu.py | 4 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingSb2PKMuXPi.py | 3 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 12 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2Invis.py | 11 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 133 ++++++------------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingSL/StrippingBc2Bs.py | 8 -- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/StrippingSemilepISR.py | 2 +- .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingCcbar2LambdaLambda.py | 4 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 5 +- .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHGamma.py | 7 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 4 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonB2DInclusive.py | 6 +- .../StrippingIFT/StrippingHeavyIonB2HHBDT.py | 6 +- .../StrippingIFT/StrippingHeavyIonB2nbody.py | 1 - .../StrippingHeavyIonConvertedPhoton.py | 2 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingHeavyIonGammaHadron.py | 5 +- .../StrippingIFT/StrippingHeavyIonMiniBias.py | 1 - .../StrippingHeavyIonOpenCharm.py | 2 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingHeavyIonSingleElectron.py | 2 +- .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping35r2/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 5 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 1 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 49 +------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingCcbar2LambdaLambda.py | 4 - .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 5 +- .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingCalib/StrippingD0ForBXX.py | 2 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHGamma.py | 7 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 4 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonMiniBias.py | 1 - .../StrippingHeavyIonOpenCharm.py | 4 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 4 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplJets.py | 2 - .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../Stripping35r3/StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 5 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 1 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 8 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 49 +------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../StrippingConfigurableUser.py | 1 - .../python/StrippingConf/StrippingStream.py | 5 +- .../StrippingConf/tests/test_strippingline.py | 2 +- Phys/StrippingNeuroBayes/options/TestBhh.py | 3 - .../options/TestNeuroBayes.py | 3 - .../options/STEP09/StrippingB2Charged2Body.py | 2 +- .../options/STEP09/StrippingB2DPi.py | 3 - .../options/STEP09/StrippingBd2JpsiKS.py | 4 +- .../options/STEP09/StrippingBd2JpsiKstar.py | 6 +- .../options/STEP09/StrippingBd2KstarMuMu.py | 5 +- .../options/STEP09/StrippingBs2JpsiPhi.py | 4 +- .../options/STEP09/StrippingBu2JpsiK.py | 6 +- .../options/STEP09/StrippingTopo.py | 1 - .../StrippingB2CC/StrippingB2JpsiHH.py | 10 +- .../StrippingB2CC/StrippingB2JpsiPi0.py | 7 +- .../StrippingB2CC/StrippingB2JpsiPi0_Run1.py | 7 +- .../StrippingB2CC/StrippingB2JpsiX0.py | 10 +- .../StrippingB2JpsiXforBeta_s.py | 4 - .../StrippingB2CC/StrippingBd2JpsieeKS.py | 6 - .../StrippingBd2JpsieeKSFullDST.py | 6 - .../StrippingB2CC/StrippingBd2JpsieeKstar.py | 1 - .../StrippingB2CC/StrippingBs2EtacPhiBDT.py | 1 - .../StrippingB2CC/StrippingBs2JpsieePhi.py | 1 - .../StrippingB2OC/Beauty2Charm_B2DXBuilder.py | 6 +- .../Beauty2Charm_Bc2BXBuilder.py | 2 - .../Beauty2Charm_Bc2DDBuilder.py | 4 +- .../Beauty2Charm_Bc2DXBuilder.py | 3 - .../StrippingB2OC/Beauty2Charm_DBuilder.py | 4 - .../StrippingB2OC/Beauty2Charm_HHBuilder.py | 1 - .../StrippingB2OC/Beauty2Charm_HHHBuilder.py | 3 +- .../StrippingB2OC/Beauty2Charm_Lb2XBuilder.py | 2 +- .../StrippingB2OC/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingB2OC/Beauty2Charm_Utils.py | 4 +- .../StrippingB2OC/StrippingB2D0X0.py | 10 +- .../StrippingB2OC/StrippingB2DDphi.py | 3 +- .../StrippingB2OC/StrippingB2DXD2HMuNu.py | 4 +- .../StrippingB2OC/StrippingB2nbody.py | 1 - .../StrippingB2OC/StrippingBeauty2Charm.py | 4 +- .../StrippingBandQ/StrippingB2Chic0KPi.py | 1 - .../StrippingBandQ/StrippingB2JpsiXforEM_s.py | 12 +- .../StrippingBandQ/StrippingBbbar2PhiPhi.py | 4 +- .../StrippingBandQ/StrippingBc2EtacMu.py | 3 +- .../StrippingBandQ/StrippingBc2EtacSL.py | 3 +- .../StrippingBandQ/StrippingBc2JpsiHBDT.py | 1 - .../StrippingBandQ/StrippingBc2JpsiMuXNew.py | 1 - .../StrippingBandQ/StrippingCC2DD.py | 3 +- .../StrippingBandQ/StrippingCcbar2Baryons.py | 1 - .../StrippingBandQ/StrippingCcbar2KsKpi.py | 3 +- .../StrippingCcbar2LambdaLambda.py | 6 +- .../StrippingCcbar2LstLambda.py | 4 - .../StrippingBandQ/StrippingCcbar2LstLst.py | 30 ++-- .../StrippingBandQ/StrippingCcbar2PPPiPi.py | 3 +- .../StrippingBandQ/StrippingCcbar2PhiPhi.py | 4 +- .../StrippingCcbar2PhiPhiDetached.py | 4 +- .../StrippingCcbar2PhiPhiPiPi.py | 15 +- .../StrippingBandQ/StrippingCcbar2PpbarNew.py | 5 +- .../StrippingChiCJPsiGammaConv.py | 3 +- .../StrippingDiMuonForXsection.py | 1 - .../StrippingBandQ/StrippingDiMuonNew.py | 1 - .../StrippingBandQ/StrippingEtap2pipimumu.py | 12 +- .../StrippingBandQ/StrippingHeavyBaryons.py | 4 - .../StrippingInclusiveCharmBaryons.py | 5 +- .../StrippingInclusiveDoubleD.py | 3 - .../StrippingBandQ/StrippingLb2EtacKp.py | 1 - .../StrippingBandQ/StrippingLb2L0X3872.py | 1 - .../StrippingBandQ/StrippingOmegab2XicKpi.py | 3 +- .../StrippingBandQ/StrippingOmegabDecays.py | 3 +- .../StrippingOniaPhotoProduction.py | 1 - .../StrippingOniaPhotoProductionPrescaled.py | 1 - .../StrippingBandQ/StrippingPPMuMu.py | 3 +- .../StrippingBandQ/StrippingXibc.py | 4 - .../StrippingBandQ/StrippingXibcBDT.py | 2 - .../StrippingBandQ/StrippingXiccBDT.py | 4 +- .../StrippingBnoC/StrippingB24pLines.py | 4 +- .../StrippingB2CharmlessInclusive.py | 3 +- .../StrippingBnoC/StrippingB2HHBDT.py | 6 +- .../StrippingBnoC/StrippingB2HHPi0.py | 5 +- .../StrippingBnoC/StrippingB2KShh.py | 1 - .../StrippingBnoC/StrippingB2KShhh.py | 6 +- .../StrippingBnoC/StrippingB2Ksthh.py | 3 +- .../StrippingB2LambdapppLines.py | 15 +- .../StrippingBnoC/StrippingB2TwoBaryons.py | 7 +- .../StrippingBnoC/StrippingB2XEta.py | 12 +- .../StrippingBnoC/StrippingB2a1Pi.py | 1 - .../StrippingB2hhpipiPhsSpcCut.py | 1 - .../StrippingBnoC/StrippingB2pphh.py | 5 +- .../StrippingBnoC/StrippingBc2hhh_BnoC.py | 4 +- .../StrippingBnoC/StrippingBs2KKhh.py | 1 - .../StrippingBnoC/StrippingBs2KSKS_Run2.py | 5 +- .../StrippingBnoC/StrippingBs2Kst_0Kst_0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiKst0.py | 5 +- .../StrippingBnoC/StrippingBs2PhiPhi.py | 7 +- .../StrippingBnoC/StrippingBu2KSh.py | 3 +- .../StrippingBnoC/StrippingBu2Ksthh.py | 5 +- .../StrippingBnoC/StrippingBu2hhh.py | 4 +- .../StrippingBnoC/StrippingBu2rho0rhoPlus.py | 1 - .../StrippingBnoC/StrippingButo5h.py | 4 +- .../StrippingBnoC/StrippingD2HHBDT.py | 3 +- .../StrippingBnoC/StrippingHb2Charged2Body.py | 5 +- .../StrippingBnoC/StrippingHb2V0V0h.py | 1 - .../StrippingBnoC/StrippingLb2V0hh.py | 21 ++- .../StrippingBnoC/StrippingLb2V0pp.py | 19 ++- .../StrippingBnoC/StrippingXb23ph.py | 1 - .../StrippingBnoC/StrippingXb2p3h.py | 1 - .../StrippingBnoC/StrippingXb2p3h_raw.py | 1 - .../StrippingBnoC/StrippingXb2phh.py | 1 - .../StrippingBnoC/StrippingXib2LbXLb2ph.py | 3 +- .../StrippingCharmFromBSemiForHadronAsy.py | 4 +- .../StrippingCharmFromBSemiForProtonPID.py | 5 +- .../StrippingCalib/StrippingD02KPiPi0.py | 5 +- .../StrippingD02KPiPi0DalitzPartReco.py | 3 - .../StrippingD02KPiPi0ForPid.py | 5 +- .../StrippingCalib/StrippingD0ForBXX.py | 2 +- .../StrippingCalib/StrippingDst2D0Pi.py | 5 +- ...pingDstarD02hhPi0PartRecoForPhotonCalib.py | 6 +- .../StrippingCalib/StrippingElectronID.py | 3 +- .../StrippingElectronRecoEff.py | 21 ++- .../StrippingCalib/StrippingEta2MuMuGamma.py | 6 +- .../StrippingCalib/StrippingJPsiForSL.py | 5 +- .../StrippingK23PiForDownstreamTrackEff.py | 36 +++-- .../StrippingCalib/StrippingLowPtMuID.py | 7 +- .../StrippingCalib/StrippingMuIDCalib.py | 9 +- .../StrippingNoPIDDstarWithD02RSKPi.py | 8 +- .../StrippingNoPIDDstarWithD02RSKPi_Brem.py | 15 +- .../StrippingCalib/StrippingPIDCalib.py | 2 - .../StrippingTrackEffD0ToKPi.py | 2 +- .../StrippingTrackEffDownMuon.py | 14 +- .../StrippingCalib/StrippingTrackEffMuonTT.py | 5 +- .../StrippingTrackEffVeloMuon.py | 18 +-- .../StrippingB2ppipiSigmacmm_Lcpi.py | 5 +- .../StrippingCharm/StrippingBs2st2pKpipipi.py | 1 - .../StrippingChargedHyperons.py | 4 - .../StrippingCharm/StrippingCharm2PPX.py | 2 +- .../StrippingCharm/StrippingCharmForVub.py | 3 +- .../StrippingCharmWeakDecays.py | 2 +- .../StrippingCharmedBaryonSL.py | 8 +- .../StrippingCharm/StrippingD02KSKS.py | 15 +- .../StrippingCharm/StrippingD2HHHKs.py | 7 +- .../StrippingCharm/StrippingD2HHHPi0.py | 7 +- .../StrippingCharm/StrippingD2HMuNu.py | 3 - .../StrippingCharm/StrippingD2KPiPiMuNu.py | 5 +- .../StrippingCharm/StrippingD2KS0H_conf.py | 4 +- .../StrippingCharm/StrippingD2PiPi0.py | 4 +- .../StrippingCharm/StrippingD2XMuMuSS.py | 7 +- .../StrippingCharm/StrippingD2hh.py | 3 +- .../StrippingCharm/StrippingD2hhh_FTcalib.py | 6 +- .../StrippingCharm/StrippingD2hhh_conf.py | 4 +- .../StrippingCharm/StrippingDstarD02xx.py | 3 +- .../StrippingCharm/StrippingDstarD0ToHHPi0.py | 2 - .../StrippingCharm/StrippingDstarD2HHHH.py | 5 +- .../StrippingCharm/StrippingDstarD2KSHHPi0.py | 5 +- .../StrippingCharm/StrippingDstarD2KShh.py | 1 - .../StrippingCharm/StrippingDstarD2XGamma.py | 5 +- .../StrippingDstarPromptWithD02HHHH.py | 5 +- .../StrippingDstarPromptWithD02HHMuMu.py | 5 +- .../StrippingExcitedDsSpectroscopy.py | 1 - .../StrippingCharm/StrippingHc2V02H.py | 2 +- .../StrippingCharm/StrippingHc2V03H.py | 4 +- .../StrippingCharm/StrippingHc2V2H.py | 2 - .../StrippingCharm/StrippingHc2V3H.py | 2 - .../StrippingCharm/StrippingKKPiPi.py | 3 +- .../StrippingCharm/StrippingLambdac2V03H.py | 2 +- .../StrippingLambdacForNeutronPID.py | 4 +- .../StrippingCharm/StrippingLc2L0LLpi.py | 7 - .../StrippingNeutralCBaryons.py | 4 - .../StrippingXcpToLambdaKSHp.py | 2 - .../StrippingCharm/StrippingXcpToXiPipHp.py | 4 +- .../StrippingCharm/StrippingXic2HHH.py | 9 +- .../StrippingCharm/StrippingXicToSigmaKPi.py | 2 +- .../StrippingCharm/StrippingXicc.py | 3 - .../StrippingCharm/StrippingXiccSL.py | 9 +- .../StrippingIFT/StrippingHeL2ppppi.py | 1 - .../StrippingIFT/StrippingHeMedian.py | 5 +- .../StrippingIFT/StrippingHeNOverflows.py | 5 +- .../StrippingHeavyIonD02KPiPi0.py | 5 +- .../StrippingIFT/StrippingHeavyIonDiMuon.py | 3 +- .../StrippingHeavyIonDst2D0KPiForPID.py | 8 +- .../StrippingIFT/StrippingHeavyIonOthercc.py | 3 +- .../StrippingIFT/StrippingHeavyIonPIDCalib.py | 1 - .../StrippingIFT/StrippingHeavyIonTopology.py | 6 +- .../StrippingHeavyIonTrackEffDownMuon.py | 16 +-- .../StrippingHeavyIonTrackEffMuonTT.py | 7 +- .../StrippingHeavyIonTrackEffVeloMuon.py | 16 +-- .../StrippingIFT/StrippingLb2V0pphh.py | 1 - .../StrippingIFT/StrippingLb2dpX.py | 2 - .../StrippingMiniBias/StrippingBadEvents.py | 1 - .../StrippingMiniBias/StrippingMiniBias.py | 1 - .../StrippingQEE/DisplVertices_Utils.py | 5 +- .../StrippingQEE/StrippingA1MuMu.py | 4 +- .../StrippingQEE/StrippingA2MuMu.py | 2 +- .../StrippingQEE/StrippingA2MuMuSameSign.py | 2 +- .../StrippingQEE/StrippingALP2TauTau.py | 4 +- .../StrippingQEE/StrippingB2EHNLLines.py | 3 +- .../StrippingQEE/StrippingB2LLP2HH.py | 2 - .../StrippingQEE/StrippingB2MuHNLLines.py | 3 +- .../StrippingQEE/StrippingConvertedPhoton.py | 6 +- .../StrippingQEE/StrippingDY2MuMu.py | 3 +- .../StrippingQEE/StrippingDY2ee.py | 3 +- .../StrippingQEE/StrippingDisplVertices.py | 1 - .../StrippingQEE/StrippingDitau.py | 5 +- .../StrippingQEE/StrippingExotica.py | 2 +- .../StrippingQEE/StrippingFullDiJets.py | 6 +- .../StrippingQEE/StrippingGluinos.py | 3 +- .../StrippingQEE/StrippingLFVExotica.py | 2 +- .../StrippingQEE/StrippingLLP2HH.py | 2 - .../StrippingQEE/StrippingLLP2Hadrons.py | 3 +- .../StrippingQEE/StrippingLLP2Jets.py | 1 - .../StrippingQEE/StrippingLLP2MuX.py | 1 - .../StrippingQEE/StrippingLambdaDecaysDM.py | 6 +- .../StrippingQEE/StrippingLb2dp.py | 4 - .../StrippingQEE/StrippingMicroDiJets.py | 5 +- .../StrippingQEE/StrippingMuMuSS.py | 2 +- .../StrippingSbarSCorrelations.py | 4 +- .../StrippingQEE/StrippingStrangeBaryons.py | 6 +- .../StrippingStrangeBaryonsNoPID.py | 4 +- .../StrippingQEE/StrippingTaggedJets.py | 3 +- .../StrippingQEE/StrippingW2nH.py | 1 - .../StrippingQEE/StrippingWJets.py | 2 - .../StrippingQEE/StrippingWRareDecay.py | 3 +- .../StrippingQEE/StrippingWe.py | 1 - .../StrippingQEE/StrippingZ02ee.py | 1 - .../StrippingQEE/StrippingZ02nH.py | 1 - .../StrippingQEE/StrippingZ0RareDecay.py | 3 +- .../depreciated/StrippingDijets.py | 3 +- .../depreciated/StrippingHighPtTopoJets.py | 2 - .../StrippingQEE/depreciated/StrippingJets.py | 6 +- .../StrippingRD/Beauty2Charm_LoKiCuts.py | 5 - .../StrippingRD/StrippingB02Lcmu_pKpi.py | 1 - .../StrippingRD/StrippingB23MuLines.py | 4 +- .../StrippingRD/StrippingB2DibaryonMuMu.py | 4 +- .../StrippingRD/StrippingB2EtaMuMu.py | 5 +- .../StrippingRD/StrippingB2KLLXInclusive.py | 6 +- .../StrippingRD/StrippingB2KSKSMuMu.py | 6 +- .../StrippingRD/StrippingB2KstTauTau.py | 3 +- .../StrippingRD/StrippingB2LLXBDT.py | 6 +- .../StrippingRD/StrippingB2LLXBDTSS.py | 8 +- .../StrippingRD/StrippingB2LLXBDT_Calib.py | 6 +- .../StrippingRD/StrippingB2Lambda0ELines.py | 1 - .../StrippingRD/StrippingB2Lambda0MuLines.py | 1 - .../StrippingB2Lambda0MuOSLines.py | 1 - .../StrippingB2Lambda0SSMuMu3PiLines.py | 1 - .../StrippingRD/StrippingB2MuMuMuMuLines.py | 2 +- .../StrippingRD/StrippingB2OCMuMu.py | 8 +- .../StrippingRD/StrippingB2XLL.py | 3 +- .../StrippingRD/StrippingB2XMuMu.py | 1 - .../StrippingRD/StrippingB2XMuTauMuonic.py | 2 - .../StrippingRD/StrippingB2XTau.py | 9 +- .../StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingRD/StrippingB2XTauTau.py | 4 +- .../StrippingRD/StrippingB2XTauTauMuonic.py | 2 - .../StrippingRD/StrippingBLVLines.py | 3 +- .../StrippingRD/StrippingBaryonicLFV.py | 4 +- .../StrippingRD/StrippingBd2KSLLX.py | 16 +-- .../StrippingRD/StrippingBd2eeKstarBDT.py | 1 - .../StrippingRD/StrippingBeauty2MajoLep.py | 12 +- .../StrippingRD/StrippingBeauty2XGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuGamma.py | 2 +- .../StrippingRD/StrippingBs2MuMuLines.py | 6 +- .../StrippingRD/StrippingBs2gammagamma.py | 5 - .../StrippingRD/StrippingBs2st2KKMuX.py | 3 +- .../StrippingRD/StrippingBu2LLK.py | 4 +- .../StrippingRD/StrippingBu2MajoLep.py | 4 +- .../StrippingRD/StrippingBu2MuNu.py | 9 +- .../StrippingRD/StrippingD23MuLines.py | 3 +- .../StrippingRD/StrippingDarkBoson.py | 13 +- .../StrippingRD/StrippingDoubleSLForRX.py | 1 - .../StrippingRD/StrippingHypb2L0HGamma.py | 6 +- .../StrippingRD/StrippingK0s2XXMuMu.py | 4 +- .../StrippingRD/StrippingKshort2Leptons.py | 3 - .../StrippingRD/StrippingKshort2MuMuMuMu.py | 9 +- .../StrippingRD/StrippingKshort2PiPiMuMu.py | 7 +- .../StrippingRD/StrippingKshort2eePiPi.py | 1 - .../StrippingRD/StrippingLFVLines.py | 10 +- .../StrippingRD/StrippingLb2L0Gamma.py | 4 - .../StrippingRD/StrippingLc23MuLines.py | 3 +- .../StrippingRD/StrippingMultiLepton.py | 7 +- .../StrippingRD/StrippingPhiToKSKS.py | 3 +- .../StrippingRD/StrippingRareBaryonicMuMu.py | 4 +- .../StrippingRD/StrippingRareNStrange.py | 3 +- .../StrippingRD/StrippingRareStrange.py | 10 +- .../StrippingRD/StrippingS2Hyperons.py | 4 - .../StrippingRD/StrippingSb2PKMuXPi.py | 3 +- .../StrippingRD/StrippingStrangeHadrons.py | 11 +- .../StrippingRD/StrippingStrangeSL.py | 11 +- .../StrippingRD/StrippingTau23MuLines.py | 3 +- .../StrippingRD/StrippingTau2LambdaMuLines.py | 4 +- .../StrippingRD/StrippingZVTOP.py | 8 +- .../StrippingSL/StrippingB23MuNu.py | 12 +- .../StrippingSL/StrippingB2DMuForTauMu.py | 6 +- .../StrippingSL/StrippingB2DMuNuX.py | 5 +- .../StrippingSL/StrippingB2DMuNuXUtils.py | 4 +- .../StrippingSL/StrippingB2Dlnu.py | 6 +- .../StrippingSL/StrippingB2Dst0MuNu.py | 7 +- .../StrippingSL/StrippingB2DstMuNuIncl.py | 5 +- .../StrippingSL/StrippingB2Invis.py | 11 +- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 9 +- .../StrippingSL/StrippingB2XTauNu.py | 133 ++++++------------ .../StrippingSL/StrippingB2XuENu.py | 18 +-- .../StrippingSL/StrippingB2XuMuNu.py | 18 +-- .../StrippingSL/StrippingBc2Bs.py | 8 -- .../StrippingCharmFromBSemiForHadronAsy.py | 3 +- .../StrippingLb2LcMuNuX_Lc2L0Pi.py | 9 +- .../StrippingSL/StrippingLb2pMuNuVub.py | 3 - .../StrippingSL/StrippingSemilepISR.py | 2 +- .../StrippingSL/Strippingbhad2PMuX.py | 5 +- .../coordinators/DV-Stripping25-Stripping.py | 2 +- .../coordinators/DV-Stripping27-Stripping.py | 4 +- .../tests/coordinators/TestFromSelections.py | 2 +- .../coordinators/TestFromSelectionsNoFT.py | 2 +- .../TestFromSelectionsNoRelInfo.py | 2 +- .../tests/coordinators/TestFromSettings.py | 3 +- .../documentation/DaVinci-Nevents.py | 1 - .../tests/coordinators/get_correlations.py | 3 - .../TestFromSettings_B2CC.py | 6 +- .../TestFromSettings_B2OC.py | 6 +- .../TestFromSettings_BandQ.py | 6 +- .../TestFromSettings_BnoC.py | 6 +- .../TestFromSettings_Calib.py | 6 +- .../TestFromSettings_Charm.py | 6 +- .../TestFromSettings_QEE.py | 6 +- .../TestFromSettings_RD.py | 6 +- .../TestFromSettings_Semileptonic.py | 6 +- .../TestFromSettings_all.py | 6 +- .../retentions/TestFromSettings_all.py | 3 +- .../tests/data/Reco14_2013pp_Run137246.py | 1 - .../data/Reco14_DataType2011_Run89335.py | 1 - .../data/Reco14_DataType2012_Run133399.py | 1 - .../tests/data/Reco14_pA_MagDown.py | 1 - .../data/Reco14r1_Protonion13_Run135710.py | 1 - .../tests/data/Reco15_NoBias.py | 1 - .../data/Reco15aLead15_Run168665_PbAr.py | 1 - .../data/Reco15aLead15_Run168665_PbAr_DV.py | 2 +- .../data/Reco15aLead15_Run169106_PbPb.py | 1 - .../data/Reco15aLead15_Run169106_PbPb_DV.py | 2 +- .../data/Reco15a_DataType2015_Run164524.py | 1 - .../data/Reco15a_DataType2015_Run164524_DV.py | 2 +- .../data/Reco16LeadSmog_Run168665_PbAr.py | 1 - .../data/Reco16_DataType2016_Run174858.py | 1 - .../data/Reco16_DataType2016_Run174858_DV.py | 2 +- .../tests/data/Reco16_Run179101.py | 1 - .../tests/data/Reco16_pAr2015.py | 1 - .../tests/data/Reco16_pHe.py | 1 - .../tests/data/Reco16pLead_Run186558_pPb.py | 1 - .../tests/data/Reco16pLead_Run187018_Pbp.py | 1 - .../data/Reco17_DataType2017_Run195969.py | 1 - .../data/Reco17_DataType2017_Run195969_DV.py | 2 +- .../tests/data/Reco17_Run198660_DV.py | 2 +- .../tests/data/Reco17aSmog_Run202253.py | 1 - .../tests/data/Reco17aSmog_Run202253_DV.py | 2 +- .../tests/data/Reco18Lead18_217952_PbNe.py | 1 - .../tests/data/Reco18Lead18_217952_PbNe_DV.py | 2 +- .../tests/data/Reco18Lead18_218177_PbPb.py | 1 - .../tests/data/Reco18Lead18_218177_PbPb_DV.py | 2 +- .../data/Reco18_DataType2018_Run214741.py | 1 - .../data/Reco18_DataType2018_Run214741_DV.py | 2 +- .../tests/data/Reco18_Run206538.py | 1 - .../tests/data/Reco18_Run206538_DV.py | 2 +- .../tests/data/Reco18_Run206574_validation.py | 1 - .../data/Reco18_Run206574_validation_DV.py | 2 +- .../tests/data/Reco18_Run209291.py | 1 - .../tests/data/Reco18_Run209291_DV.py | 2 +- .../tests/data/Reco18_Run214741.py | 1 - .../tests/data/Reco18_Run214741_DV.py | 2 +- .../data/Reco18_Run217951_validation_DV.py | 2 +- .../data/Reco18_Run218177_validation_DV.py | 2 +- .../data/Reco18_problemValidation_Feb2019.py | 2 - .../tests/data/fulldst154030_trigfilt.py | 1 - .../tests/data/validationReco2015a.py | 1 - .../tests/data/validationReco2016.py | 1 - .../tests/liaisons/B2CC/S21_tests/TestB2CC.py | 2 +- .../TestMyWGfromSelections_Run1.py | 2 +- .../S21p1_tests/TestMyWGfromSettings_Run1.py | 3 +- .../r1p1_tests/TestMyWGfromSettings_Run1.py | 3 +- .../liaisons/B2CC/S23_tests/TestB2CC_sels.py | 2 +- .../B2CC/S23_tests/TestB2CC_settings.py | 3 +- .../liaisons/B2CC/S24_tests/TestB2CC_sels.py | 2 +- .../B2CC/S24_tests/TestB2CC_settings.py | 3 +- .../S24r1_tests/TestMyWGfromSelections.py | 2 +- .../B2CC/S24r1_tests/TestMyWGfromSettings.py | 3 +- .../B2CC/S26_tests/TestMyWGfromSelections.py | 2 +- .../B2CC/S26_tests/TestMyWGfromSettings.py | 3 +- .../S26r1_tests/TestMyWGfromSelections.py | 2 +- .../B2CC/S26r1_tests/TestMyWGfromSettings.py | 3 +- .../B2CC/S28_tests/TestMyWGfromSelections.py | 2 +- .../B2CC/S28_tests/TestMyWGfromSettings.py | 3 +- .../B2CC/S29_tests/TestMyWGfromSelections.py | 2 +- .../B2CC/S29_tests/TestMyWGfromSettings.py | 3 +- .../B2CC/S34_tests/TestMyWGfromSelections.py | 2 +- .../B2CC/S34_tests/TestMyWGfromSettings.py | 2 +- .../S34r0p1_tests/TestMyWGfromSelections.py | 2 +- .../S34r0p1_tests/TestMyWGfromSettings.py | 2 +- .../old_builders/StrippingB2CharmoniumX_6H.py | 1 - .../B2CC/old_builders/StrippingB2Psi2SX.py | 6 +- .../old_builders/StrippingB2Psi2SXMuMu.py | 4 - .../liaisons/B2OC/TestBeauty2Charm-MC.py | 7 +- .../tests/liaisons/B2OC/TestBeauty2Charm.py | 2 +- .../liaisons/BandQ/TestMyWGfromSelections.py | 2 +- .../liaisons/BandQ/TestMyWGfromSettings.py | 2 +- .../liaisons/BnoC/TestBnoCfromSelections.py | 2 +- .../liaisons/BnoC/TestBnoCfromSettings.py | 3 +- .../liaisons/Calibrations/TestCalibLines.py | 2 +- .../Calibrations/TestMyWGfromSelections.py | 2 +- .../Calibrations/TestMyWGfromSettings.py | 2 +- .../liaisons/Calibrations/TestPIDLines.py | 2 +- .../S34r0p1_tests/TestMyWGfromSelections.py | 2 +- .../S34r0p1_tests/TestMyWGfromSettings.py | 2 +- .../tests/liaisons/QEE/TestS22.py | 2 +- .../tests/liaisons/QEE/TestS26_Selections.py | 2 +- .../tests/liaisons/SL/TestB2DMuNuX.py | 2 +- .../tests/liaisons/SL/TestB2DstMuNuIncl.py | 2 +- .../tests/liaisons/SL/TestSLfromSelections.py | 2 +- .../tests/liaisons/TestMyWGfromSelections.py | 2 +- .../liaisons/TestMyWGfromSelections_Run1.py | 2 +- .../tests/liaisons/TestMyWGfromSettings.py | 2 +- .../liaisons/TestMyWGfromSettings_Run1.py | 3 +- .../tests/users/DV-RedoCaloPID-Stripping21.py | 2 +- .../tests/users/StrippingTupleExample.py | 1 - .../tests/users/TestMyStrippingLine_EM.py | 2 +- .../LineConfigDictionaries_B2CC.py | 1 - .../LineConfigDictionaries_B2OC.py | 1 - .../LineConfigDictionaries_B2CC.py | 1 - .../LineConfigDictionaries_B2OC.py | 1 - .../LineConfigDictionaries_B2CC.py | 1 - .../LineConfigDictionaries_B2OC.py | 1 - .../LineConfigDictionaries_B2CC.py | 1 - .../LineConfigDictionaries_B2OC.py | 1 - .../LineConfigDictionaries_B2CC.py | 1 - .../LineConfigDictionaries_B2OC.py | 1 - .../LineConfigDictionaries_BandQ.py | 1 - .../LineConfigDictionaries_B2CC.py | 1 - .../LineConfigDictionaries_B2OC.py | 1 - 3652 files changed, 5026 insertions(+), 12702 deletions(-) mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py mode change 100755 => 100644 Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py mode change 100755 => 100644 Phys/StrippingConf/python/StrippingConf/StrippingStream.py mode change 100755 => 100644 Phys/StrippingConf/tests/test_strippingline.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py mode change 100755 => 100644 Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/TestFromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/TestFromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py mode change 100755 => 100644 Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py mode change 100755 => 100644 Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py mode change 100755 => 100644 Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py old mode 100755 new mode 100644 index faac2879b..d4c2763d5 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" # ============================================================================= __all__ = ( diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py index 02660a5b6..ff9899f39 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py index acaaa4563..962c509c9 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py index 6c5cdcbb1..519f74f8b 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py old mode 100755 new mode 100644 index 66847ea24..65f4569a4 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py @@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py index 02660a5b6..ff9899f39 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py index acaaa4563..962c509c9 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py index 6c5cdcbb1..519f74f8b 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py old mode 100755 new mode 100644 index 66847ea24..65f4569a4 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py @@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py old mode 100755 new mode 100644 index ea06f33d3..f8bc12004 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py @@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py index 02660a5b6..ff9899f39 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py index acaaa4563..962c509c9 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py index 6c5cdcbb1..519f74f8b 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py old mode 100755 new mode 100644 index 66847ea24..65f4569a4 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py @@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py old mode 100755 new mode 100644 index 03a0eda3a..83d543a00 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py @@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py old mode 100755 new mode 100644 index faac2879b..d4c2763d5 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" # ============================================================================= __all__ = ( diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py index 0219b1e67..d5d3419a0 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py @@ -21,7 +21,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py index 97db5f4b9..f5143379c 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py @@ -19,7 +19,6 @@ __date__ = '29/06/2009' from Gaudi.Configuration import * from Configurables import FilterDesktop from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py index 109569b76..2a44a32a1 100644 --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py @@ -20,7 +20,6 @@ from Gaudi.Configuration import * # , OfflineVertexFitter, OnOfflineTool from Configurables import CombineParticles from CommonParticles.Utils import * -import GaudiKernel.SystemOfUnits as Units ########################### # StdVeryLooseDetachetKst2Kpi # diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py old mode 100755 new mode 100644 index 67c402da2..24e57e62e --- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py +++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py @@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles' from Configurables import LHCbConfigurableUser from Configurables import TrackSelector from Configurables import DataOnDemandSvc -from Gaudi.Configuration import * author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl" version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $" # ============================================================================= diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py index 692c26648..d8622e854 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index d01512cfa..8d36b45c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1355,7 +1351,7 @@ class B2DXBuilder(object): 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"] } - input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID + self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID inputs = { 'B2D0st2460D0K': self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index af663b759..7449f0734 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py index 05f581bbf..802efc84d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -385,7 +385,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -2050,9 +2049,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles( # ( hasTopoChild() ) CombinationCut="ADAMASS('phi(1020)') < 150*MeV", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py index 08f113046..83e86c72d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 4ca95e738..28ca931f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index dcd1e601c..360fe99e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1598,7 +1598,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py index 7949e5482..84d6df196 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py index a421e3214..f5120a3fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdAllNoPIDsProtons, StdNoPIDsUpPions, StdLooseMuons, StdNoPIDsUpKaons, StdLooseResolvedPi0, StdLooseMergedPi0) -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py index 8877c5bc3..c522e1fc8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py @@ -15,9 +15,8 @@ Module for B_c->eta_c mu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '15/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py index b6b5864ff..4fc4ffd7e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py @@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '07/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 627203da2..283be918e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions -from StandardParticles import StdLoosePions, StdNoPIDsDownPions -from StandardParticles import StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '27/01/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py index 7b897199b..247fee87e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py index d3d1d1ace..af48f7c83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '25/1/2019' @@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py index a64e6452e..56181c200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py index 3bb5f912f..f78227698 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,12 +18,9 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py index 595b70726..f21e96937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py index 6cb9b0c8a..445c8816a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py @@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0', 'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py index 7d0962de9..b1f2adb65 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py @@ -24,8 +24,7 @@ __version__ = '$Revision: 1.0 $' __all__ = ('XibDecaysConf', 'makeLc', 'makeXic0', 'makeXib2LcKpi', 'makeXib2Xicpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py index bb255a96f..f8813f46f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py index 8e1d82eeb..9bc10b6c0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py @@ -36,7 +36,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel', 'Markus Roehrken'] __date__ = '29/05/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py index 9581b3a3c..a344f55b8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py @@ -24,7 +24,6 @@ __date__ = '28/05/2019' __version__ = 'Stripping28r2' __all__ = 'Lb2V04hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -381,7 +380,7 @@ class Lb2V04hConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -556,7 +555,7 @@ class Lb2V04hConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py index 23c63deba..77385a7d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py index 2f768ece0..cd04a1f6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py @@ -23,16 +23,10 @@ __version__ = '$Revision: 1.1 $' __all__ = ('CaloPIDConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Combine3BodySelection -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm default_config = { 'NAME': 'CaloPID', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 08e7ce501..6156fdca3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 331ebd34b..a1e805b96 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py index 60507d78d..9b3e955df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiGammaConf', 'makeD02KPiGamma', 'default_config') # Selections taken from Regis Lefevre D02Kpipi0 lines #################################################################### -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py index b0efbccbb..a431e7b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index caaa8b1b8..7a1c97e88 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py index 836cb251b..d9859abdb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py index e4131dad4..3306ddfaa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py @@ -25,9 +25,8 @@ Stripping selection for D*0 -> [D0 -> K pi gamma] pi+ __all__ = ('StrippingDst2D0PiConf', 'makeD02KPiGamma', 'makeDst2D0Pi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index 644f0bd8f..7e79ca79a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py index f8385e403..1b5dd98b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py index c938bbfa4..96d9c5923 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py index 484737563..9647c11e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 914c4a47c..5969dfaaf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py index 8623a70bd..14cb90659 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py @@ -34,9 +34,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py index b93a420e3..1a0ca1d60 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 3e974208b..b891dd1de --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -39,35 +39,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', 'default_config', 'selMuonPParts', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py index ab3be8ab2..968289b56 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -52,11 +52,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'default_config', 'makeResonanceMuMuTrackEff', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons from Configurables import (MuonCombRec, MuonTTTrack, MuonHitDecode, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 1932ea736..397b76425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py index f493f6bd9..e0da6bf83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHGammaLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py index 98c15ef26..83a654c81 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun'] __date__ = '07/05/2019' __version__ = '$Revision: 0.01 $' @@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons + from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config) _mupid = StdAllLooseMuons if self._config["NoPIDmu"]: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py index 413505503..968b6ee94 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -28,12 +28,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -251,7 +249,6 @@ def globalEventCutFilter(name, MaxTrSIZE=None): if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py index bf59f6f83..188f8b414 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py @@ -28,7 +28,6 @@ __version__ = '$Revision: 0.3 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -36,11 +35,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py index 6bdf6a7bf..b32a173f2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py @@ -26,7 +26,7 @@ __date__ = '18/07/2019' __all__ = ('default_config', 'StrippingHc2V02HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop # from StandardParticles import StdNoPIDsPions as InputPionsPiPi # from StandardParticles import StdNoPIDsKaons as InputKaons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py index d3888168f..2c9fd0089 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py @@ -24,11 +24,9 @@ __date__ = '13/10/2017' __all__ = ('default_config', 'StrippingHc2V03HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdAllLoosePions as InputPions from StandardParticles import StdAllLooseKaons as InputKaons -from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py index 968b10448..5f91de838 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py @@ -14,8 +14,6 @@ Exclusive lines for Xic+ -> Lambda0 KS0 pi+ and Xic0 -> Lambda0 K- pi+ Author: M. Stahl ''' -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py index b38a84b86..c8361ce17 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, ParticleTransporter, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py index 0c2b044b5..e97c2ed82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py index df8ad92d7..42c4e6409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py @@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics. Based on those by Patrick K. ''' -from Configurables import RelInfoConeVariables from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Configurables import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic -from Gaudi.Configuration import * +from Configurables import FilterDesktop __author__ = 'Cesar da Silva' __date__ = '30/04/2017' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py index c63f00873..685921c79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py @@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics. Based on those by Patrick K. ''' -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Yanxi ZHANG, Emilie MAURICE' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py index 89ba90160..75ee902a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -31,8 +31,8 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiKernel.SystemOfUnits import GeV, MeV, mrad +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py index 68874ffb4..efc32ecd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdAllLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py index 4751a2767..ce4c263cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py @@ -14,7 +14,7 @@ Stripping selections for single scattered electrons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Giacomo Graziani' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py index 19f3d03c9..8308d72b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 6e7eb7567..0880e97b0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 56d4a18ef..3af84c0e2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 0e0704532..7cd8b2c0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py index 96c2f57f7..38ecb8542 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py @@ -14,13 +14,12 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, IncompatibleInputLocations, - CloneCallable, makeOutputLocation, setOutputLocation) + makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index abe503359..3eacb151a --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py @@ -22,11 +22,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py index fb0c0e5bd..dbb90795e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py @@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py index 0b9ad4036..8593dce82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py index 3a1106bd6..458ae4344 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py @@ -20,13 +20,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py index ff470d2d6..23dcde2c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py @@ -20,7 +20,7 @@ __all__ = ('ConvertedPhotonConf', 'default_config') from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import ( DiElectronMaker, @@ -28,8 +28,7 @@ from Configurables import ( ParticleTransporter, LoKi__VertexFitter, ) -from PhysSelPython.Wrappers import (Selection, SimpleSelection, - MergedSelection, AutomaticData) +from PhysSelPython.Wrappers import (Selection, MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py index 87815b149..98a521ed9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py index 04dec7ea9..36bd711e1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py index 153e6a08f..594bbe867 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py index adc6e5196..2fed6d326 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index 774669335..344691f63 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py @@ -154,8 +154,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -936,7 +935,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 544d195e6..0212fcbde --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py @@ -33,7 +33,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py index 1e54dc4e2..bebda7a47 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py index cce1aef99..6ecf1b2ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py @@ -15,11 +15,10 @@ __all__ = ('GluinosJetsConf', 'default_config') from Gaudi.Configuration import * from StandardParticles import StdJets -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE from CommonParticles.Utils import * from Configurables import FilterDesktop, JetVertexAlg diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 0b04ec6ed..1e18590e7 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py @@ -171,7 +171,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = [ diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py index cbb3d601d..0a07d3ff4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '24/01/2019' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py index ad5869ed2..05b9288c0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py index 1fe569976..d224b684c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py @@ -15,7 +15,6 @@ __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") -from LHCbKernel.Configuration import * from GaudiKernel import SystemOfUnits as units from PhysSelPython.Wrappers import AutomaticData, Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index e9720d9e0..71e00421e --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py @@ -20,15 +20,11 @@ __version__ = 'v2r1' __all__ = ('Lb2dpConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py index 53504471c..48a3e7bea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py index 431547890..40f980448 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py index 29103497b..2ebd6f479 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py @@ -23,10 +23,8 @@ __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' __all__ = ('SbarSCorrelationsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py index 840a332bb..b11f2d20b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py @@ -23,14 +23,10 @@ __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' __all__ = ('StrippingStrangeBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons -from CommonParticles import StdLooseLambda -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'StrangeBaryons', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 13d95b441..28c41c819 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -23,12 +23,10 @@ __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' __all__ = ('StrippingStrangeBaryonsNoPIDConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'StrangeBaryonsNoPID', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 795832ef1..fb75194ba --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py index 7de8fc5d9..8a3b772f6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py @@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'W2nH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 043f1547c..94742800d --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV __author__ = "Xabier Cid Vidal" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py index 54df08028..e2ae1d62d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'WRareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py index 59f63e96c..c42ba0b0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py index 0f6bc7a98..1abd32cad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py index 447780b6c..b1f0290f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py @@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'Z02nH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py index ab636e06a..4b366b8cb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py index f55d8734a..0f8c3d7c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py @@ -14,8 +14,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index cc4053e60..ebb09a007 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -20,8 +20,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py index f4449288c..fe0b8c3cb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py @@ -14,13 +14,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py index 447780b6c..b1f0290f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py @@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'Z02nH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py index f381d03d4..ba15a0b21 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py index a54a8d62d..8222b357d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py @@ -19,9 +19,7 @@ Note: from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -303,7 +301,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel( OutputList=self.name + "SelKsDD", @@ -337,7 +335,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel( OutputList=self.name + "SelLambdaDD", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py index d4fe321dc..976ac58d3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py @@ -18,7 +18,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py index 44cd40b22..f25de253e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau """ diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py index 92fae7bab..f267c86a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi' @@ -451,7 +451,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons from StandardParticles import StdLooseProtons as Protons - from StandardParticles import StdAllLoosePions as AllPions from StandardParticles import StdAllLooseKaons as AllKaons from StandardParticles import StdAllLooseProtons as AllProtons from StandardParticles import StdLooseKstar2Kpi as Kstars @@ -1773,7 +1772,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -1948,7 +1946,6 @@ class Bu2LLKConf(LineBuilder): linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py index 0601486c8..655431951 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from Configurables import DiElectronMaker, ProtoParticleCALOFilter from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX('MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX('PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX('PiPiDD', default_config['XDD'], 'KS0 -> pi+ pi-', @@ -418,7 +413,7 @@ class DarkBosonConf(LineBuilder): '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -629,7 +624,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py index 9fac7dec5..e7856b8d2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py @@ -18,7 +18,6 @@ from StandardParticles import StdAllNoPIDsElectrons from StandardParticles import StdNoPIDsUpPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py index 4a7726e9b..279eff2f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1778,7 +1776,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2418,7 +2415,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py index 6adb37dd0..b2fa9b13c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py index 7fbc22fc5..34974681b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py index 98dff760c..c0162b92c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 1d97e42a9..4d4fe19ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py index 7e086d886..6ace30c6e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py @@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 074ba01a4..729f75ac3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py index 8a6589b1c..2bc95cdbc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Yanxi ZHANG'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index a4eadcafc..185bf2bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py index fe413a53c..4553b4495 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -30,7 +30,7 @@ __all__ = ( from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py index 71fc25135..a28622e66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index d9a2032b6..d77dca0c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig -from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons +from StrippingUtils.Utils import LineBuilder +from StandardParticles import StdAllLooseMuons, StdLooseKaons from Configurables import (MuonCombRec, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 48751a571..80a17511d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py index 96c0813f0..52296e67d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Yanxi ZHANG'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py index ab9c1f95f..5d5f045d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -30,7 +30,7 @@ __all__ = ( from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 04451dca9..a78c74425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig -from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons +from StrippingUtils.Utils import LineBuilder +from StandardParticles import StdAllLooseMuons, StdLooseKaons from Configurables import (MuonCombRec, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c91e15eca..9b65c2764 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py index 692c26648..d8622e854 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index d01512cfa..8d36b45c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1355,7 +1351,7 @@ class B2DXBuilder(object): 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"] } - input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID + self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID inputs = { 'B2D0st2460D0K': self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index af663b759..7449f0734 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py index 05f581bbf..802efc84d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -385,7 +385,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -2050,9 +2049,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles( # ( hasTopoChild() ) CombinationCut="ADAMASS('phi(1020)') < 150*MeV", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py index 08f113046..83e86c72d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 4ca95e738..28ca931f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index dcd1e601c..360fe99e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1598,7 +1598,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py index 7949e5482..84d6df196 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py index a421e3214..f5120a3fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdAllNoPIDsProtons, StdNoPIDsUpPions, StdLooseMuons, StdNoPIDsUpKaons, StdLooseResolvedPi0, StdLooseMergedPi0) -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py index 8877c5bc3..c522e1fc8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py @@ -15,9 +15,8 @@ Module for B_c->eta_c mu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '15/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py index b6b5864ff..4fc4ffd7e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py @@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '07/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 627203da2..283be918e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions -from StandardParticles import StdLoosePions, StdNoPIDsDownPions -from StandardParticles import StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '27/01/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py index 7b897199b..247fee87e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py index d3d1d1ace..af48f7c83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '25/1/2019' @@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py index a64e6452e..56181c200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py index 3bb5f912f..f78227698 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,12 +18,9 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py index 595b70726..f21e96937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py index 6cb9b0c8a..445c8816a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py @@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0', 'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py index 7d0962de9..b1f2adb65 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py @@ -24,8 +24,7 @@ __version__ = '$Revision: 1.0 $' __all__ = ('XibDecaysConf', 'makeLc', 'makeXic0', 'makeXib2LcKpi', 'makeXib2Xicpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py index bb255a96f..f8813f46f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py index 8e1d82eeb..9bc10b6c0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py @@ -36,7 +36,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel', 'Markus Roehrken'] __date__ = '29/05/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py index 9581b3a3c..a344f55b8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py @@ -24,7 +24,6 @@ __date__ = '28/05/2019' __version__ = 'Stripping28r2' __all__ = 'Lb2V04hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -381,7 +380,7 @@ class Lb2V04hConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -556,7 +555,7 @@ class Lb2V04hConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py index 23c63deba..77385a7d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py index 2f768ece0..cd04a1f6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py @@ -23,16 +23,10 @@ __version__ = '$Revision: 1.1 $' __all__ = ('CaloPIDConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Combine3BodySelection -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm default_config = { 'NAME': 'CaloPID', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 08e7ce501..6156fdca3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 331ebd34b..a1e805b96 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py index 60507d78d..9b3e955df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiGammaConf', 'makeD02KPiGamma', 'default_config') # Selections taken from Regis Lefevre D02Kpipi0 lines #################################################################### -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py index b0efbccbb..a431e7b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index caaa8b1b8..7a1c97e88 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py index 836cb251b..d9859abdb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py index e4131dad4..3306ddfaa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py @@ -25,9 +25,8 @@ Stripping selection for D*0 -> [D0 -> K pi gamma] pi+ __all__ = ('StrippingDst2D0PiConf', 'makeD02KPiGamma', 'makeDst2D0Pi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index 644f0bd8f..7e79ca79a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py index f8385e403..1b5dd98b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py index c938bbfa4..96d9c5923 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py index 484737563..9647c11e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 914c4a47c..5969dfaaf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py index 8623a70bd..14cb90659 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py @@ -34,9 +34,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py index b93a420e3..1a0ca1d60 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 3e974208b..b891dd1de --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -39,35 +39,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', 'default_config', 'selMuonPParts', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py index ab3be8ab2..968289b56 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -52,11 +52,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'default_config', 'makeResonanceMuMuTrackEff', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons from Configurables import (MuonCombRec, MuonTTTrack, MuonHitDecode, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 1932ea736..397b76425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py index f493f6bd9..e0da6bf83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHGammaLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py index 98c15ef26..83a654c81 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun'] __date__ = '07/05/2019' __version__ = '$Revision: 0.01 $' @@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons + from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config) _mupid = StdAllLooseMuons if self._config["NoPIDmu"]: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py index 413505503..968b6ee94 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -28,12 +28,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -251,7 +249,6 @@ def globalEventCutFilter(name, MaxTrSIZE=None): if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py index bf59f6f83..188f8b414 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py @@ -28,7 +28,6 @@ __version__ = '$Revision: 0.3 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -36,11 +35,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py index 6bdf6a7bf..b32a173f2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py @@ -26,7 +26,7 @@ __date__ = '18/07/2019' __all__ = ('default_config', 'StrippingHc2V02HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop # from StandardParticles import StdNoPIDsPions as InputPionsPiPi # from StandardParticles import StdNoPIDsKaons as InputKaons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py index d3888168f..2c9fd0089 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py @@ -24,11 +24,9 @@ __date__ = '13/10/2017' __all__ = ('default_config', 'StrippingHc2V03HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdAllLoosePions as InputPions from StandardParticles import StdAllLooseKaons as InputKaons -from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py index 968b10448..5f91de838 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py @@ -14,8 +14,6 @@ Exclusive lines for Xic+ -> Lambda0 KS0 pi+ and Xic0 -> Lambda0 K- pi+ Author: M. Stahl ''' -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py index b38a84b86..c8361ce17 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, ParticleTransporter, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py index 0c2b044b5..e97c2ed82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py index df8ad92d7..42c4e6409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py @@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics. Based on those by Patrick K. ''' -from Configurables import RelInfoConeVariables from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Configurables import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic -from Gaudi.Configuration import * +from Configurables import FilterDesktop __author__ = 'Cesar da Silva' __date__ = '30/04/2017' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py index c63f00873..685921c79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py @@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics. Based on those by Patrick K. ''' -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Yanxi ZHANG, Emilie MAURICE' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py index 89ba90160..75ee902a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -31,8 +31,8 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiKernel.SystemOfUnits import GeV, MeV, mrad +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py index 68874ffb4..efc32ecd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdAllLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py index 4751a2767..ce4c263cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py @@ -14,7 +14,7 @@ Stripping selections for single scattered electrons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Giacomo Graziani' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py index 19f3d03c9..8308d72b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 6e7eb7567..0880e97b0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 56d4a18ef..3af84c0e2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 0e0704532..7cd8b2c0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py index 96c2f57f7..38ecb8542 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py @@ -14,13 +14,12 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, IncompatibleInputLocations, - CloneCallable, makeOutputLocation, setOutputLocation) + makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index abe503359..3eacb151a --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py @@ -22,11 +22,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py index fb0c0e5bd..dbb90795e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py @@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py index 0b9ad4036..8593dce82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py index 3a1106bd6..458ae4344 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py @@ -20,13 +20,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py index ff470d2d6..23dcde2c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py @@ -20,7 +20,7 @@ __all__ = ('ConvertedPhotonConf', 'default_config') from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import ( DiElectronMaker, @@ -28,8 +28,7 @@ from Configurables import ( ParticleTransporter, LoKi__VertexFitter, ) -from PhysSelPython.Wrappers import (Selection, SimpleSelection, - MergedSelection, AutomaticData) +from PhysSelPython.Wrappers import (Selection, MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py index 87815b149..98a521ed9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py index 04dec7ea9..36bd711e1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py index 153e6a08f..594bbe867 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py index adc6e5196..2fed6d326 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index 774669335..344691f63 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py @@ -154,8 +154,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -936,7 +935,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 544d195e6..0212fcbde --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py @@ -33,7 +33,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py index 1e54dc4e2..bebda7a47 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py index cce1aef99..6ecf1b2ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py @@ -15,11 +15,10 @@ __all__ = ('GluinosJetsConf', 'default_config') from Gaudi.Configuration import * from StandardParticles import StdJets -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE from CommonParticles.Utils import * from Configurables import FilterDesktop, JetVertexAlg diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 0b04ec6ed..1e18590e7 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py @@ -171,7 +171,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = [ diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py index cbb3d601d..0a07d3ff4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '24/01/2019' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py index ad5869ed2..05b9288c0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py index 1fe569976..d224b684c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py @@ -15,7 +15,6 @@ __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") -from LHCbKernel.Configuration import * from GaudiKernel import SystemOfUnits as units from PhysSelPython.Wrappers import AutomaticData, Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index e9720d9e0..71e00421e --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py @@ -20,15 +20,11 @@ __version__ = 'v2r1' __all__ = ('Lb2dpConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py index 53504471c..48a3e7bea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py index 431547890..40f980448 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py index 29103497b..2ebd6f479 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py @@ -23,10 +23,8 @@ __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' __all__ = ('SbarSCorrelationsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py index 840a332bb..b11f2d20b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py @@ -23,14 +23,10 @@ __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' __all__ = ('StrippingStrangeBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons -from CommonParticles import StdLooseLambda -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'StrangeBaryons', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 13d95b441..28c41c819 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -23,12 +23,10 @@ __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' __all__ = ('StrippingStrangeBaryonsNoPIDConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'StrangeBaryonsNoPID', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 795832ef1..fb75194ba --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py index 7de8fc5d9..8a3b772f6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py @@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'W2nH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 043f1547c..94742800d --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV __author__ = "Xabier Cid Vidal" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py index 54df08028..e2ae1d62d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'WRareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py index 59f63e96c..c42ba0b0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py index 0f6bc7a98..1abd32cad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py index 447780b6c..b1f0290f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py @@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'Z02nH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py index ab636e06a..4b366b8cb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py index f55d8734a..0f8c3d7c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py @@ -14,8 +14,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index cc4053e60..ebb09a007 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -20,8 +20,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py index f4449288c..fe0b8c3cb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py @@ -14,13 +14,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py index 447780b6c..b1f0290f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py @@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'Z02nH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py index f381d03d4..ba15a0b21 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py index a54a8d62d..8222b357d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py @@ -19,9 +19,7 @@ Note: from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -303,7 +301,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel( OutputList=self.name + "SelKsDD", @@ -337,7 +335,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel( OutputList=self.name + "SelLambdaDD", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py index d4fe321dc..976ac58d3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py @@ -18,7 +18,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py index 44cd40b22..f25de253e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau """ diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py index 92fae7bab..f267c86a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi' @@ -451,7 +451,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons from StandardParticles import StdLooseProtons as Protons - from StandardParticles import StdAllLoosePions as AllPions from StandardParticles import StdAllLooseKaons as AllKaons from StandardParticles import StdAllLooseProtons as AllProtons from StandardParticles import StdLooseKstar2Kpi as Kstars @@ -1773,7 +1772,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -1948,7 +1946,6 @@ class Bu2LLKConf(LineBuilder): linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py index 0601486c8..655431951 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from Configurables import DiElectronMaker, ProtoParticleCALOFilter from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX('MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX('PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX('PiPiDD', default_config['XDD'], 'KS0 -> pi+ pi-', @@ -418,7 +413,7 @@ class DarkBosonConf(LineBuilder): '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -629,7 +624,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py index 9fac7dec5..e7856b8d2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py @@ -18,7 +18,6 @@ from StandardParticles import StdAllNoPIDsElectrons from StandardParticles import StdNoPIDsUpPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py index 4a7726e9b..279eff2f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1778,7 +1776,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2418,7 +2415,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py index 6adb37dd0..b2fa9b13c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py index 7fbc22fc5..34974681b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py index 98dff760c..c0162b92c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 1d97e42a9..4d4fe19ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py index 7e086d886..6ace30c6e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py @@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 074ba01a4..729f75ac3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py index 8fdba29f0..e3ae45446 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 523cdae39..e1c610266 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py index b553711d6..2ca00a91b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py index 4c73451a5..0f5de6e61 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Gerwin Meier' __date__ = '2019/08/12' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py index 326fc7c34..b6ae6bfc4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 4837b0a43..04c8a298f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1399,7 +1395,7 @@ class B2DXBuilder(object): 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"] } - input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID + self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID inputs = { 'B2D0st2460D0K': self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index af663b759..7449f0734 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py index b68548ee7..5b18c6b24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -385,7 +385,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -2058,9 +2057,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles( # ( hasTopoChild() ) CombinationCut="ADAMASS('phi(1020)') < 150*MeV", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py index 08f113046..83e86c72d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 7673d8fca..3e955dda8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index 6f58dbe55..049552af8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1704,7 +1704,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py index 7949e5482..84d6df196 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py index 830d1c343..ed453e6e9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py @@ -19,18 +19,10 @@ __date__ = '29/11/2021' __all__ = ('B2D0X0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2D0X0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py index 1ec2da4c2..0711ca388 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py index 884208b81..fb3342063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdAllNoPIDsProtons, StdNoPIDsUpPions, StdLooseMuons, StdNoPIDsUpKaons, StdLooseResolvedPi0, StdLooseMergedPi0) -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py index c0e64ca5c..ce1d72039 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py @@ -15,9 +15,8 @@ Module for B_c->eta_c mu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '15/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py index 2d376003a..4fa26a1cb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py @@ -23,9 +23,8 @@ B_c->eta_c tau, with eta_c->K_s K pi and tau->3pi from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '24/06/2021' __version__ = '$Revision: 1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py index b6b5864ff..4fc4ffd7e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py @@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '07/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 8ce57a0eb..a92e180d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -18,14 +18,12 @@ Apply very loose P/PT cuts on proton and pions ''' from StandardParticles import StdAllLoosePions, StdAllLooseProtons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdNoPIDsDownProtons -from StandardParticles import StdNoPIDsProtons -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from StandardParticles import StdNoPIDsDownPions, StdNoPIDsDownProtons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov', 'Jinlin Fu', 'Ziyi Wang'] __date__ = '20/06/2021' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py index 7b897199b..247fee87e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py index f03d28c2c..89f19ca3d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '10/3/2020' @@ -178,10 +176,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py index 92ada5696..5547236ca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis', 'updated by Vitalii Lisovskyi'] __date__ = '19/05/2011' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 9e29771dd..de3a1066b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py index 9372dd979..9454a8ad6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,12 +18,9 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py index fa5c47368..2596756ef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py index 0ef3e6ee6..c9b94fd99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py @@ -15,7 +15,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Xijun Wang' __date__ = '2021-3-18' __version__ = 'Stripping28' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py index 8a70403dd..d421f354b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py index 6cb9b0c8a..445c8816a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py @@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0', 'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py index 19c34eb3a..976853052 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py @@ -32,7 +32,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV -from Configurables import HCRawBankDecoderHlt default_config = { 'JpsiPhotoProduction': diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py index 3438f5858..f29c13fc3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py @@ -27,7 +27,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV -from Configurables import HCRawBankDecoderHlt default_config = { 'JpsiPhotoProductionPrescaled': diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py index db2b4d65b..a6b52e064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py index 79abd1433..c90f7faea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py index 41030075a..e86c40013 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py index 0ec9c6a5d..0ba12bf37 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py @@ -23,7 +23,6 @@ __date__ = '05/02/2021' __version__ = 'Stripping29r2p2' __all__ = 'B2LambdapppLinesConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -214,8 +213,8 @@ class B2LambdapppLinesConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -270,8 +269,8 @@ class B2LambdapppLinesConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -304,7 +303,7 @@ class B2LambdapppLinesConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B0_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_DD_PTsum'] @@ -436,7 +435,7 @@ class B2LambdapppLinesConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B0_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_LD_PTsum'] @@ -452,7 +451,7 @@ class B2LambdapppLinesConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['B0_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['B0_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B0_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['B0_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 3ca4b3b86..5ffc4a205 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py index cc743704a..1f66a1746 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 1792d3977..ada24235b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py index c20e2b517..19a07b4fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py @@ -23,7 +23,6 @@ __date__ = '16/12/2020' __version__ = 'Stripping28' __all__ = 'Bu2KShConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -258,7 +257,7 @@ class Bu2KShConf(LineBuilder): _massCutLow = "(AM>(5279-%s)*MeV)" % config['B_Mlow'] _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2)>%s*MeV)" % config['BDaug_DD_PTsum'] _combCuts = _massCutLow diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py index d92d1478c..c412d7f27 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping29r2p1' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py index 54b56a996..7b8a9c8dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py @@ -27,7 +27,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Gediminas Sarpis', 'Hendrik Jage'] __date__ = '06/04/2021' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py index 2f1d600f0..6f8394542 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py @@ -21,7 +21,6 @@ __version__ = "1.0" __all__ = ("Xib2LbXLb2phLines", "default_config") -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from StandardParticles import (StdAllNoPIDsPions, @@ -30,7 +29,7 @@ from StandardParticles import (StdAllNoPIDsPions, from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index c458c3e6c..98fad852e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 6c6f284aa..4afa986a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py index b8f25c655..7fd939520 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index ac92a6c8c..c14b9b11f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py index 6f502e7b9..1f1c5f4a9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py @@ -26,9 +26,8 @@ __all__ = ('StrippingD02KPiPi0ForPidConf', 'makeD02KPiPi0R', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLoosePi02gg diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py index bd7db7dbc..b5eea4d7c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py index 358d6686a..950314e23 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py @@ -40,9 +40,8 @@ __all__ = ('StrippingDst2D0PiConf', 'makeDst2D0Pi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg, StdLoosePi02gg diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index c047319a0..64e2e6642 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -33,15 +33,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py index 72e0b978a..56eb58e21 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He', 'Vitalii Lisovskyi'] __date__ = '21/06/2021' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py index d630ed353..be5c53aa3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py @@ -25,12 +25,10 @@ __all__ = ('StrippingEta2MuMuGammaConf', 'makeMuMuGamma', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllLooseMuons default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py index e464daa38..3d23ab459 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py index fa526c7de..5315ade7f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index d2de08dbe..a43c58f87 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -29,7 +27,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+). __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py index 23bbe71b4..9232160ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py @@ -10,15 +10,12 @@ ############################################################################### from CommonParticles.Utils import trackSelector, updateDoD -from Configurables import NoPIDsParticleMaker, CombinedParticleMaker -from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsElectrons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import AutomaticData, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = 'Vitalii Lisovskyi' __date__ = '15/03/2021' __version__ = '$Revision: 0.0 $' @@ -29,7 +26,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+) for hadron->e ''' -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles @@ -649,7 +646,7 @@ def brempion_PMaker(name, Particle='pion') algorithm_pi.AddBremPhotonTo = ['pi+'] # configure the track selector - selector_pi = trackSelector(algorithm_pi) + trackSelector(algorithm_pi) # configure Data-On-Demand service updateDoD(algorithm_pi) # finally: define the symbol @@ -694,7 +691,7 @@ def bremkaon_PMaker(name, Particle='kaon') algorithm_K.AddBremPhotonTo = ['K+'] # configure the track selector - selector_K = trackSelector(algorithm_K) + trackSelector(algorithm_K) # configure Data-On-Demand service updateDoD(algorithm_K) # finally: define the symbol diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py index e82b56942..e6940ae61 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py index c9b3c9d60..ee9bc7b3c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 02a389d2c..ac589d4b1 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py @@ -49,35 +49,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py index 84b931c72..aae7dfa49 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py @@ -65,11 +65,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 316195569..25cd049b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py index e71b5b307..41168201d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py @@ -23,7 +23,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Matt Rudolph'] __date__ = '2021/3/14' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py index 636aeca53..f88fa93a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py @@ -37,16 +37,12 @@ __version__ = '$Revision: 0.1 $' __all__ = ('StrippingCharmedBaryonSL', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons +from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseProtons, StdAllVeryLooseMuons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -import sys +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_name = 'CharmedBaryonSL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py index eacf772b4..efe5ef893 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '03/19/2021' __version__ = '$Revision: 0.02 $' @@ -97,7 +95,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py index 7e19b796a..c3359cfd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun'] __date__ = '07/05/2019' __version__ = '$Revision: 0.01 $' @@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons + from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config) _mupid = StdAllLooseMuons if self._config["NoPIDmu"]: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py index d9497b537..3ac31a1bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py index bef9e3302..bcfa56160 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -21,18 +21,17 @@ __version__ = '$Revision: 1.1 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py index e7b224211..20835582f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py @@ -32,7 +32,6 @@ __version__ = '$Revision: 0.5 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -40,11 +39,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py index c55a09ec5..937669104 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py @@ -29,7 +29,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop # from StandardParticles import StdNoPIDsPions as InputPionsPiPi # from StandardParticles import StdNoPIDsKaons as InputKaons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py index d3888168f..2c9fd0089 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py @@ -24,11 +24,9 @@ __date__ = '13/10/2017' __all__ = ('default_config', 'StrippingHc2V03HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdAllLoosePions as InputPions from StandardParticles import StdAllLooseKaons as InputKaons -from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py index ae08b01f2..a730881c7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py @@ -17,12 +17,10 @@ Exported selection makers: 'makeLc', 'makeSigmac', 'makeSigmacWS', """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Marco Pappagallo'] __date__ = '17/03/2021' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py index 5cd5cf6bb..147241ad2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py @@ -31,13 +31,9 @@ __version__ = '$Revision: 1.1 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py index 91757124d..90176344c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py @@ -11,8 +11,6 @@ """ Exclusive lines for Xc+ -> Lambda0 KS0 h+ """ -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py index 8e47ddfa3..5a28d5b8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py @@ -13,10 +13,8 @@ Stripping lines for Xic+ -> Xi- pi+ pi+, Lc+ -> Xi- pi+ K+ and Xic+ -> Xi- pi+ K The lines are used to complement the inclusive Xi Turbo lines by adding Velo raw banks to study if the Xi- can be reconstructed as an upstream track. """ -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import ( - FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection) + FilterSelection, CombineSelection, Combine3BodySelection) from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py index 71b78eea7..d6856b0e1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py @@ -15,7 +15,7 @@ Exclusive lines for Xic+ -> Sigma0 KS0 pi+, Xic0 -> Sigma0 K- pi+ and Xic+ -> Si from CommonParticles.Utils import updateDoD from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import (FilterDesktop, ResolvedPi0Maker, PhotonMaker) +from Configurables import (ResolvedPi0Maker, PhotonMaker) from PhysConf.Selections import (FilterSelection, Combine3BodySelection, MergedSelection, SimpleSelection) from PhysSelPython.Wrappers import AutomaticData diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py index f5880e4d7..d77d3c930 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py @@ -38,17 +38,12 @@ __version__ = '$Revision: 0.3 $' __all__ = ('StrippingXiccSL', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import TisTosParticleTagger -import sys default_name = 'XiccSL' @@ -400,7 +395,7 @@ class StrippingXiccSL(LineBuilder): _strCutMoth_Zero = "(CHILD(VFASPF(VZ),1) - VFASPF(VZ) > %(Omegacc_Lc_delta_VZ_Min)s)" \ "& (BPVDIRA > %(Omegacc_Zero_BPVDIRA_Min)s)" % self.config - _strCutMoth2 = _strChi2Moth2 + '&' + _strCutMoth + _strChi2Moth2 + '&' + _strCutMoth _strCutMoth2_Zero = _strChi2Moth2 + '&' + _strCutMoth_Zero ''' Stripping Omega_cc+ -> Omega_c0 mu+ ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py index 8e3831dcc..8a3816804 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Hendrik Jage', 'Gediminas Sarpis'] __date__ = '19/03/2021' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py index 46870fe2f..940b716b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py @@ -19,15 +19,12 @@ __version__ = 'v0r1' __all__ = ('HeMedianConf', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsProtons as Protons -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'HeMedian', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py index 6e86f2745..2b79ea417 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py @@ -19,15 +19,12 @@ __version__ = 'v0r1' __all__ = ('HeNOverflowsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsProtons as Protons -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'HeNOverflows', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py index 7006c283f..b23478e8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py index d76254846..d4ecc7b6f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py index df8b9c18c..9b8d406ef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py index 19f3d03c9..8308d72b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 4b221c471..bd21417c5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index d45ec02ac..e2e32a543 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig -from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons +from StrippingUtils.Utils import LineBuilder +from StandardParticles import StdAllLooseMuons, StdLooseKaons from Configurables import (MuonCombRec, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c0bb11bf8..38f843265 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py index 3ee7aeb4f..e7e59c7c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py @@ -24,7 +24,6 @@ __date__ = '19/03/2021' __version__ = 'v1r0' __all__ = {'Lb2V0pphhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py index c5a28128f..ad0fc42d4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py @@ -24,7 +24,6 @@ __all__ = ('Lb2dpXConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from StandardParticles import StdAllNoPIDsPions as Pions @@ -33,7 +32,6 @@ from StandardParticles import StdAllNoPIDsKaons as Kaons from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dpX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py index a5398df14..db69855d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py @@ -9,12 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from CommonParticles import StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py index 0a74c48c6..a3e372506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py @@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $' __all__ = ('B2EHNLLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons +from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py index 1b9907eed..ababbe64f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py @@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $' __all__ = ('B2MuHNLLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons +from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py index e1e5fb0be..25b226c2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py index 5b0be7ca6..ce06625ea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 53d4e78db..8fde59168 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py @@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py index 9f9b7b90a..cf5af4522 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py index 00c3a16a5..f3d787247 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '23/06/2021' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV, picosecond -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py index 4db1eeb4f..3aec384d4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py @@ -14,10 +14,9 @@ Stripping lines selecting scalar long-lived particles decaying to hadrons """ -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py index 5e11c78ec..6aa23424c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py index bc00d02ab..a5598540a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py @@ -13,18 +13,14 @@ Lines for searches on DM candidates produced from Lambda decays (arXiv:2101.02706). """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * -from CommonParticles.Utils import * -from CommonParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseKaons, StdAllLooseProtons, StdAllLoosePions from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, picosecond, millimeter +from GaudiKernel.SystemOfUnits import MeV, millimeter __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Saul Lopez Solino'] __date__ = '18/03/2021' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py index bad4ad035..6334bd68b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py index 2624678f1..36fb89fcb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py index 578635fa7..9c45d8c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 295b8a41d..bb3326270 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index ae80ec7c3..48a0b2de2 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py index 3244d01c6..7c9eae26a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi; based on Bu2LLK lines' __date__ = '04/09/2019' __version__ = '$Revision: 1 $' @@ -112,7 +111,6 @@ class B2DibaryonMuMuConf(LineBuilder): # 2 : Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py index b614d11a7..6a856fa99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '04/09/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py index 60fc5ccbd..b1a382095 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'Vitalii Lisovskyi' __date__ = '18/06/2021' __version__ = '$Revision: 1 $' @@ -72,7 +71,6 @@ class B2KSKSMuMuConf(LineBuilder): # Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)&(PROBNNmu>0.01)))" SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py index 4bfb173d1..df476bc07 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py @@ -16,8 +16,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano, F. Polci, T. Fulghesu'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py index 6547c8d92..9a503cdbd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He', 'Yanting Fan', 'Angel Campoverde'] __date__ = '17/06/2021' __version__ = '$Revision: 1.0 $' @@ -228,7 +226,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Di letpons """ - from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllLooseANNElectrons, StdLooseDiMuonSameSign, StdAllLooseMuons + from StandardParticles import StdAllLooseANNElectrons, StdAllLooseMuons, StdLooseDiMuonSameSign self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron", DecayDescriptor="[J/psi(1S) -> e+ e+]cc", @@ -296,7 +294,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -332,7 +330,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py index 56119a8de..28e6f3608 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py @@ -19,9 +19,7 @@ Note: from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Jibo He', 'Yanting Fan'] __date__ = '10/03/2021' __version__ = '$Revision: 1.0 $' @@ -194,7 +192,7 @@ class B2LLXBDT_CalibConf(LineBuilder): """ Di letpons """ - from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllNoPIDsElectrons, StdAllNoPIDsMuons + from StandardParticles import StdAllNoPIDsElectrons, StdAllNoPIDsMuons self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron", DecayDescriptor='J/psi(1S) -> e+ e-', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py index fa05d51ee..290a038e1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -21,7 +21,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py index 85a7ae0f5..be3956da7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # as FilterDesktop_GC -from GaudiKernel.SystemOfUnits import MeV -from CommonParticles.Utils import updateDoD from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from Configurables import (ResolvedPi0Maker, PhotonMaker) +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '05/03/2021' __version__ = '$Revision: 0 $' @@ -76,9 +72,7 @@ class B2OCMuMuConf(LineBuilder): BcLine_name = name+"Bc" BcNoPointLine_name = name+"BcNoPoint" - from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseProtons as Protons from StandardParticles import StdAllNoPIDsPions as AllPions from StandardParticles import StdAllNoPIDsKaons as AllKaons from StandardParticles import StdAllNoPIDsProtons as AllProtons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py index 018806639..e0f7a0afc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py index 1273eebf7..822bfb329 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py @@ -22,8 +22,6 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2XMuTauMuonicConf', 'default_config') -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py index 44cd40b22..f25de253e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau """ diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py index 7954d22e0..8cc4c1f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py @@ -23,8 +23,6 @@ __version__ = '$Revision: 0.2 $' __all__ = ('B2XTauTauMuonicConf', 'default_config') -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py index a346ce2d2..85c93efc5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py @@ -32,14 +32,12 @@ __version__ = '$Revision: 0.0 $' __all__ = ('BaryonicLFVConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combine5Particles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'BaryonicLFV', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py index 1c734bb1d..61c847ace 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.2' __all__ = ('Beauty2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdAllNoPIDsMuons as Muons from StandardParticles import StdAllNoPIDsPions as Pions @@ -424,7 +422,7 @@ class Beauty2MajoLepConf(LineBuilder): def makeMu(self, name, config): # define all the cuts _bachPtCut = "(PT>%s*MeV)" % config['Lep_PTmin'] - _bachIPChi2Cut = "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min'] + "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min'] _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _pidMuon = '(ISMUON)' @@ -860,7 +858,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] - _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow'] + "(AM>(%s*MeV))" % config['Majo_AMlow'] _combCuts = _massCutHigh + '&'+_docaCut @@ -893,7 +891,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] - _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow'] + "(AM>(%s*MeV))" % config['Majo_AMlow'] _combCuts = _massCutHigh + '&'+_docaCut _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] @@ -1111,7 +1109,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutLow = "(AM>(%s*MeV))" % config['AM_Mlow'] _massCutHigh = "(AM<(%s*MeV))" % config['AM_Mhigh'] - _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] + "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] _combCuts = _massCutLow+'&'+_massCutHigh diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py index c9930debc..6a5687b69 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py index 138975959..80bf86657 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N5BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi, Biplab Dey' @@ -1733,7 +1733,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -2080,7 +2079,6 @@ class Bu2LLKConf(LineBuilder): ################################################################################################################################# def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py index 83456277a..d92e0c670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py @@ -11,7 +11,6 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from itertools import product from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DelegatingTrackSelector, CombineParticles, LoKi__VertexFitter from CommonParticles.Utils import * from StandardParticles import StdNoPIDsUpElectrons @@ -23,11 +22,9 @@ from StandardParticles import StdNoPIDsDownPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdLooseDownMuons from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Adrian Casais Vidal', 'Carla Marin', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py index 45b59c0fd..832334778 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py index 4a7726e9b..279eff2f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1778,7 +1776,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2418,7 +2415,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py index afbfe24d3..c83aa90e0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py @@ -12,8 +12,8 @@ from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, DaVinci__N5BodyDecays, DaVinci__N6BodyDecays +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, FilterDesktop from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '05/03/2021' @@ -100,14 +100,11 @@ class MultiLeptonConf(LineBuilder): Jpsi2Mu3EDetLine_name = name+'_Jpsi2Mu3EDetached' Jpsi2Mu3EPromptLine_name = name+'_Jpsi2Mu3EPrompt' - from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseProtons as Protons from StandardParticles import StdVeryLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD from StandardParticles import StdVeryLooseLambdaLL as LambdasLL from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdaLD as LambdasLD from StandardParticles import StdLoosePhi2KK as Phi2KK from StandardParticles import StdLooseKstar2Kpi as KstartoKpi from StandardParticles import StdLooseLambdastar2pK as Lstar diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py index e3c0eaddc..51ba747a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py @@ -12,11 +12,10 @@ from GaudiKernel.SystemOfUnits import MeV from CommonParticles.Utils import updateDoD from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection from Configurables import (ResolvedPi0Maker, PhotonMaker) from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import FilterDesktop as FilterDesktop_GC -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '26/02/2021' __version__ = '$Revision: 0 $' @@ -343,7 +342,6 @@ class RareBaryonicMuMuConf(LineBuilder): # 2 : Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe>0)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py index a24627bc3..ff85ddd92 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py index 4b77564a2..cc3f28a66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py @@ -18,13 +18,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingS2HyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py index 1a58f8ff0..c9a1d99c7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py @@ -12,9 +12,8 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Dan Thompson; based on combination of Bu2LLK lines and Bs2st2KKMuXLine" __date__ = "14/06/2021" __version__ = "$Revision: 1$" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py index d2bc92f6c..f76088d68 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py @@ -36,7 +36,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -74,7 +73,7 @@ class Tau23MuLinesConf(LineBuilder): tau_name = name+'Tau23Mu' tau_name_DST = name+'Tau23Mu_DST' tau_name_DST_3mu = name+'Tau23Mu_DST_3mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' ds2PhiPi_name_DST = name+'Ds2PhiPi_DST' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py index 73f06f152..76ad4b5dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf', 'default_config') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -282,7 +279,6 @@ class B23MuNuConf(LineBuilder): ) # specify leptons to identify the muon candidate - RelInfoTools_fake_mumue = RelInfoTools_fake # RelInfoTools_fake_mumue[0] = { "Type" : "RelInfoMuonIDPlus", # "Variables" : ["MU_BDT"], # "DaughterLocations" : { @@ -416,14 +412,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, @@ -434,14 +429,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dielectron """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py index 51c5a39b0..3ffd86fc0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py index 34c3af4e6..efaa9d2a1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py index 59745cf95..8839d6b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py @@ -15,12 +15,7 @@ __version__ = '$Revision: 0.0 $' These are some lines for measuring the BF of Lc->pKpi and Ds->KKpi """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions __all__ = ('B2InvisAllLinesConf', 'default_config') @@ -267,7 +262,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ Filter ##### def _BpFilter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True) @@ -284,7 +279,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ same-sign Filter ##### def _Bp_SSFilter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi+]cc"], ReFitPVs=True) @@ -301,7 +296,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ fake proton Filter ##### def _Bp_fakeP_Filter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py index ab951b0df..bf18b6074 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -448,7 +445,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -465,7 +462,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -482,7 +479,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py index 27a551c0c..4a7e33c3b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py @@ -762,7 +762,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1633,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder): def __MakeTau23pi__(self): from PhysSelPython.Wrappers import DataOnDemand - from CommonParticles import StdLooseDetachedTauNoPID self.tau23piSel = DataOnDemand(Location=self.tau_path) @@ -1699,7 +1697,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterD02K3pi__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions, StdLooseKaons CombD02K3pi = CombineParticles( @@ -1720,7 +1718,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterD02K3piForDst__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions, StdLooseKaons CombD02K3piForDst = CombineParticles( @@ -1741,7 +1739,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterDstarD02K3pi__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions CombDstar2piD02K3pi = CombineParticles( @@ -1759,7 +1757,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterDstarD02K3piWS__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions CombDstar2piD02K3piWS = CombineParticles( @@ -1850,7 +1848,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1869,7 +1866,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1889,8 +1886,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1914,8 +1910,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1941,8 +1936,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1968,7 +1962,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1992,8 +1985,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2018,8 +2010,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2045,8 +2036,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2072,8 +2062,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2100,8 +2089,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2129,7 +2117,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2155,8 +2142,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D0(->K3pi) tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2183,8 +2169,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2213,7 +2198,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2241,8 +2225,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2268,8 +2251,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2296,7 +2278,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2320,8 +2301,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2347,8 +2327,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2376,7 +2355,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2401,8 +2379,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B_c+ -> J/psi(1S) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2428,7 +2405,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2452,8 +2428,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B_s0 -> D_s- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2479,8 +2454,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2507,7 +2481,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2532,8 +2505,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [Lambda_b0 -> Lambda_c+ tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2561,8 +2533,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2588,8 +2559,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [Lambda_b0 -> p+ tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2614,8 +2584,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2641,7 +2610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2668,8 +2636,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of inverted vertex cut only first, should boost the overall efficiency """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2695,8 +2662,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of inverted vertex cut only first, should boost the overall efficiency """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2720,8 +2686,7 @@ class B2XTauNuAllLinesConf(LineBuilder): Also useful for studying background in B0 -> D* tau nu when pi- from D** decay is missed """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2746,8 +2711,7 @@ class B2XTauNuAllLinesConf(LineBuilder): Also useful for studying WS background in B0 -> D* tau nu when pi+ from D** decay is missed """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2773,7 +2737,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2798,7 +2761,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2817,8 +2780,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D*0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2842,8 +2804,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2868,7 +2829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2892,7 +2852,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2911,8 +2871,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D*0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2936,8 +2895,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2962,7 +2920,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2985,7 +2942,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -3004,8 +2961,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3029,8 +2985,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3055,7 +3010,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -3078,7 +3032,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -3097,8 +3051,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3122,8 +3075,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3148,7 +3100,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py index 599af631e..dd86fee48 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py @@ -11,9 +11,7 @@ __author__ = ['Adam Davis'] __date__ = '12/03/2021' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder -import logging """ Selections for Bc -> Bs X @@ -173,7 +171,6 @@ class Bc2BsBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # GECs for # long tracks self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -492,7 +489,6 @@ class Bc2BsBuilder(LineBuilder): return self._Ds2KKpiSel from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions, StdAllLooseKaons _Ds2KKpi = CombineParticles( DecayDescriptors=["[D_s+ -> K+ K- pi+]cc"], @@ -515,7 +511,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions, StdAllLooseKaons _Phi2KK = CombineParticles( DecayDescriptors=["phi(1020) -> K+ K-"], @@ -537,7 +532,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLooseMuons _Jpsi2mumu = CombineParticles( DecayDescriptors=["J/psi(1S) -> mu+ mu-"], @@ -582,7 +576,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions _Bs2DsPi = CombineParticles( DecayDescriptors=["[ B_s0 -> D_s- pi+ ]cc", @@ -605,7 +598,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLooseKaons _Bs2DsK = CombineParticles( DecayDescriptors=["[ B_s0 -> D_s- K+ ]cc", "[B_s0 -> D_s+ K+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 827fcbc76..230adf6c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL, StdLooseLambdaLL, StdLooseLambdaDD -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseLambdaDD, StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py index 9003d470a..9d2d80fb9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py @@ -26,7 +26,7 @@ from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons # from StrippingSemilepISRUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from CommonParticles.Utils import * __all__ = ('SemilepISRAllLinesConf', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py index 6ff148861..9661c75a7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py index d101d6736..07e3c0f58 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 98d9454e3..ca1071c46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 098bb6abd..45db0c074 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py index 07219a0d2..09096eb19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index d69562e93..51b7aaa9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py index e348ef543..7ddeef246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 541ddeee2..78bf5b565 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1014,7 +1010,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index b6f87b17a..ee3e55145 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 97d0925f7..5d9ad7c30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 9296ddf6f..d9598e8c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py index fd77399ae..789ce80de 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -315,7 +315,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1800,9 +1799,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py index f91cef3b5..a5f7f08c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 73bdd42ab..148169c36 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index 3650ed5d9..38d85b42a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1155,7 +1155,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index da5ba556d..b376cda82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py index 53e1e9516..5aa6a17bb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py index fc49b483c..649ee42b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py index e31b819ff..da52d1d71 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py index fffd8e491..f3dd308be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py @@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays -from Configurables import SubPIDMMFilter # Default configuration dictionary default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py index 9084c61c0..2e6227101 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py index 13669f766..07fcaee5f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py index 5ff751290..94ae3fe82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py @@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdLooseMergedPi0, StdLooseResolvedPi0) -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID __author__ = 'Andrea Contu' __date__ = '04/10/2010' __version__ = '$Revision: 1.5 $' @@ -85,7 +85,6 @@ def makeD02kpipi0(name): str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))" str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)" str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc" - str_D0_Sidebands = "200*MeV" d0 = CombineParticles() d0.DecayDescriptor = str_D0_DecayDescriptor_RS diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py index 0b2215730..ad2959732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py @@ -12,19 +12,12 @@ Module for selecting Lb->Lambda_c+ pi ''' -from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, - StdAllNoPIDsProtons, StdNoPIDsUpPions, - StdLooseMuons, StdNoPIDsUpKaons, - StdLooseResolvedPi0, StdLooseMergedPi0) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from PhysSelPython.Wrappers import MergedSelection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index bc246c589..42cf65a76 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 68d2ae631..99d49369a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py index 9fff4e975..0f2af87a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 187d4d700..422fa39bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py index 56531b5bc..1598c1f9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py index db1a8e674..db554d3a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py index 6515f84ca..ad9039b46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -21,12 +21,10 @@ confCcbar2LstLst = Ccbar2LstLstConf( name = 'Ccbar2LstLst', config = config_Ccba stream.appendLines( confCcbar2LstLst.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -70,22 +68,22 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - CcbarPT = config['CcbarPT'] - KaonProbNNk = config['KaonProbNNk'] - KaonPT = config['KaonPT'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonPT = config['ProtonPT'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] - Lst_TisTosSpecs = config['Lst_TisTosSpecs'] + config['TRCHI2DOF'] + config['CcbarPT'] + config['KaonProbNNk'] + config['KaonPT'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonPT'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] + config['Lst_TisTosSpecs'] """ Unbiased, require Hlt Tis diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 1baf5793c..98fdb7f11 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py index 699437c3b..28e46f5fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index e6a23c416..2efa73daa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index ddb88e195..909028912 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -61,12 +60,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py index 516985c59..9d41a780f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 39414a291..b17f83d53 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py index 21f73ebac..ce4daa121 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py index 8a272ad23..f0e46c0b4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py index eb64c1750..fa0dcf9a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py index 0c836118d..63e11ca5d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py index 3e2d953e5..8d75e01e9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py index 1df5d93b8..fcea01500 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py index 09c274076..4d314b69f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py index fbb6cc13c..c4c8bfdaa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py index 2b6300f56..578167c76 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py @@ -8,17 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdTightPions, StdNoPIDsKaons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdAllNoPIDsProtons, StdNoPIDsKaons, StdNoPIDsPions from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * from GaudiKernel.SystemOfUnits import MeV, mm, ns from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py index cd4fb8c12..c47838a89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py index 6a1293248..d0ef68a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py index cd9fc5146..84e599e9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '30/11/2016' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py index 718d39a23..722215da6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py @@ -15,9 +15,8 @@ B->charmless quasi 2-body selection from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '25/07/2014' __version__ = '$Revision: 2.8 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py index 373482252..901009730 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py index 7f0781e48..37ddfd772 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py @@ -26,9 +26,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py index b6ed5f7d6..213f6377b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py index a35d44f01..19e01960a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py index e878d0304..1bfb413fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py index be5394ee6..26bb8d6f6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py index ed24e9afa..a85b63d0f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py index 7122ae867..db0bacbfa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 98e460d75..193ff53fe --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py index 36ea85af4..7f9a438ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py index dde55525b..f12ace21a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 4580afecf..e5c6f3efd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index b53f616c9..7a979a9ea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py index aef03c619..760de6aa1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py index 58996ef52..611bd2bca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members: from StandardParticles import StdAllLooseANNKaons as MyLooseKaons from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py index 1fd6ba791..4f9c1afdf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py index b0e05de78..a56f353bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index b3c5e6c8c..f8977b65f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py index f513b2eb8..86d97904e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py index 0dfb222d2..91e98da0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py index 5892ee9c6..213bb72f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py index f6702785b..52ebfc4be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py index 2641bd9d0..afba240ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '21/05/2015' __version__ = 'Stripping23' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -392,7 +391,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut @@ -597,7 +596,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py index 8067c7a6d..f09fc331b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py index b2c3ad4b4..19d8a03d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py index b19f47e92..8ab8cbe05 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 7b207e6c1..f15420286 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 92af0a7a1..81115d7fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py index 162aeb0dd..115a1c5c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index 329adac1d..66aa89c6a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py index 769c83ae0..f24af2698 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py index b9dfbf867..c7400e8e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py index 0901cc37b..8290b32fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py index 2c8d1c88b..b1034d405 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py index bc111971f..e70ca9d56 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 0c80077a3..5b5457511 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py index 9fd00b351..ff38d7bcf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py index 96a8666b5..5afe8fb66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index ff7ca8fc3..f0e488bfb --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py index 641201574..f27b71e4d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py old mode 100755 new mode 100644 index 9a14b8675..10dd86282 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 83239c94c..6e136b7ba 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py index 5607b756d..6a46e9597 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py index fefe1d342..802e8316c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py index 96f3dd5c1..89ec6575a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py index cd0f35790..5c0183ffd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -611,7 +610,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -648,7 +647,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -685,7 +684,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -722,7 +721,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -759,7 +758,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -796,7 +795,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py index 9a861cb09..b60a33fa5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py index ed8648686..f006ce35a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py index 5f50a6446..b7803b391 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py index 61aa4a7c3..99e1b1032 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py index 3b0409acb..0b95d6415 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py index 63052973a..d25cc78a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py index 04f7a2eaa..132e325c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -185,7 +184,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py index ca556fcd0..92b63ab8b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -267,7 +264,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py index 4edfcbbf7..2b5bbdd7a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -755,7 +754,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py index d6432a15e..31c1f92b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py index bf75d26a7..0fc805caf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py index 6ca6b394d..b1010c3cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py index 8004878d3..d717afb5c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py index 930ba6dd1..5c17fdff8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py index 0b8f07c8e..a162a42f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py @@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index ee13ea7fe..5e817ce46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index a131e40e3..7a1541f08 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy @@ -224,7 +223,6 @@ def makeD02hhll( _pionCuts = _pionCutsOLD + " & " + _ghostCut _eleCuts = _eleCutsOLD + " & " + _ghostCut - from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseMuPion diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 71165c716..e210c6918 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -347,7 +347,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py index d82de0a68..30b545399 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py index 857d348c5..ec6a57054 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py index fa3250a83..327a50012 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py index 4c7a52873..ec6e744b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py index 5d7a3369f..b7f50de19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index f59616873..38d1f1cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py index 1f1fb6fd6..c05fa9e4e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index f65a07782..2a6ac3e49 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py index ccee2be91..1f6d52b84 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py @@ -17,12 +17,11 @@ __author__ = ['IFT'] __date__ = '29/03/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLoosePions, StdNoPIDsProtons __all__ = ('HeavyIonIncLcForProtonPIDConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py index a915f2133..64496a63a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py index 16e2016d6..376c9f63f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py index f5989cd6b..6f1af3c69 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,14 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from LoKiPhys.functions import SOURCE -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 53e68cac2..d5239b2b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index c0dfb7ba8..250433bd8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 1a80cc957..c63358516 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py index fdfc79a58..ed393ad52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py @@ -17,17 +17,6 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon from StrippingUtils.Utils import getLineBuildersFromModule as _getter __author__ = 'Juan Palacios palacios@physik.uzh.ch' -import StrippingHeavyIonOpenCharm -import StrippingHeavyIonWMuNu -import StrippingHeavyIonConvertedPhoton -import StrippingHeavyIonDiMuon -import StrippingHeavyIonOthercc -import StrippingHeavyIonTopology -import StrippingHeavyIonGammaHadron -import StrippingHeavyIonTrackEffMuonTT -import StrippingHeavyIonTrackEffDownMuon -import StrippingHeavyIonD02KPiPi0 -import StrippingHeavyIonIncLcForProtonPID from sys import modules as _modules _this = _modules[__name__] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py index 1c381f645..b6bfb5f29 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py index da1ac5dd5..986b1718c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py index 75fad1a93..f7ae00ee0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 2fbd096e0..999ae0e27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py index 7f662d87e..75edb9aa5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py index 1cd5ccbaa..432c22256 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py index 514a5dde8..03356ebe0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py @@ -24,9 +24,8 @@ DY2MuMu4 (20-40GeV): StdAllLooseMuons & TrkPChi2>0.1% & P>10GeV & pT>3GeV __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py index 5a0368434..fdc374106 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py @@ -18,9 +18,8 @@ __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py index 67725bbba..6ff23d235 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index 0ad441ea8..0472121f4 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index c02471267..9d041d417 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py @@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py index 2981965bb..9d0f27dcf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py index ac4b3b9c5..54239d73e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py @@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0 from GaudiKernel.SystemOfUnits import GeV from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 59d45b25c..1a886e380 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py @@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py index d58edd684..fe88689a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index 6fd0fdcc5..7d202e58f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py index 111d837cb..01e67268d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py index 1d7798298..43046078d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py index 249c3f9ab..69b3d4273 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py index 0b5d595c5..ae8735231 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 11d394ddb..df33cc795 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index aa10ffcef..421ef28a3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py index 3fbf48b1f..f16a508b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index d522b8b50..3da8ccba4 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py index 7ef7290f4..d3358d522 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py index 7cdca666d..dae887a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py index 0bb2cccfd..03ee6a325 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py @@ -21,7 +21,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py index f262f43a0..82fb2760e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py index ed5c2136a..e1a140f93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py index 719ab092d..1bd1ad771 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index f62f8db8c..da12c39fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py index 0a37d40f9..75e825eb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py index 2250a080d..7ed3e8ea2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py index c0209e4a8..aedb7955e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py index 4d5da6cdc..e11f8912e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py index 427dc4aa1..695822b35 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -373,7 +370,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py index b7765b884..2ca7e7f98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py index 509cd9d83..1c05c4023 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -295,7 +293,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -331,7 +329,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py index 465f34ce3..9a6ac1b58 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py index 9c92c11a0..6e1b98b4e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 0ec257778..17e343584 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py index bf8f80ead..5ee373244 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py index 8f3f40d4d..d2cb8108d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py @@ -9,15 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py index ae80a6487..b82b80518 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py index 6dc1f3c32..20e7e7d7a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py index 33f47f29c..f56a4e55e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py index b876ae5d9..f15067d27 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections """ -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles @@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Violaine Bellee', 'Albert Puig'] __date__ = '08/04/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py index 6ed0f1ff2..f471cc532 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py @@ -25,7 +25,7 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py index 158db5f4c..30dd36648 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py index 53f415519..f105ed628 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py index 81d36d685..8bd9c599b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho' __date__ = '16/06/2014' __version__ = '$Revision: 3 $' @@ -768,7 +767,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py index 961fe2a14..c3380097f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py index 093b37f68..53ebfe877 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -268,7 +267,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py index 0725ecd79..9cac5b811 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py index 1e5733609..e42cad2ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams'] moduleName = 'DarkBoson' @@ -252,7 +247,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -274,7 +269,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -391,7 +386,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py index c04d6c7bc..703ec457e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py index fb11a2289..ecbacfd2c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -408,7 +408,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py index 0eb02eba0..af7182392 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py index df7f615d0..207773409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py index da78ba561..f1c66b71d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py index dff170300..1a3aa2f94 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1181,7 +1179,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1675,7 +1673,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2314,7 +2311,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py index 048e24b93..1311185e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py index 4d0e65fd6..e57d2f0f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py @@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py index ff5893ed3..3a3bda006 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py index 45ebc9b80..96da26c9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py index 59b26f2a2..5a42379b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py @@ -51,15 +51,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2150,7 +2146,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py index d9cca6b4a..efcddadd2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py index 8cd7c6388..bf1088a93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py index ea1f9b620..307ea9bc3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop old__author__ = ['G. Mancinelli, J Cogan'] __date__ = '14/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py index 5f1edbaaa..1b49cee09 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -189,14 +186,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py index 24bd5252a..12dee166b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py index 17cd5b71d..be298e6b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py index 4c6dd348f..7bce3fa7f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py index 314d6e309..d9b1a081f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py index 2deca338b..1cc8f4345 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index bbf2f30af..165fed745 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -110,7 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -420,7 +417,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py index 8efb67709..fcbc8d4cc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py @@ -608,7 +608,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStarTauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1126,7 +1125,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1145,7 +1143,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2DstarPi = CombineParticles( @@ -1167,7 +1165,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1191,7 +1188,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1215,7 +1211,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1239,7 +1234,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1264,7 +1258,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1289,7 +1282,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1313,7 +1305,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1338,7 +1329,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1363,7 +1353,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1388,7 +1377,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1412,7 +1400,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1436,7 +1423,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1461,7 +1447,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1486,7 +1471,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1511,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1537,7 +1520,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1561,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1587,7 +1568,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1612,7 +1592,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1638,7 +1617,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1662,7 +1640,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1686,7 +1663,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1711,7 +1687,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1737,7 +1712,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py index 200bd7771..26632da67 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia'] __date__ = '08/05/2010' __version__ = '$Revision: 1.6 $' @@ -227,7 +225,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles") @@ -633,8 +631,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -754,7 +752,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -782,7 +780,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index ae6916ee1..50c775a99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py index e10913eb9..af26a4266 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py index 3ba91114e..81c8f0a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -135,7 +133,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -458,7 +455,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py index 6ff148861..9661c75a7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py index d101d6736..07e3c0f58 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 98d9454e3..ca1071c46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 098bb6abd..45db0c074 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py index 07219a0d2..09096eb19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py index d69562e93..51b7aaa9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py index e348ef543..7ddeef246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 541ddeee2..78bf5b565 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1014,7 +1010,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index b6f87b17a..ee3e55145 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 97d0925f7..5d9ad7c30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 9296ddf6f..d9598e8c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py index fd77399ae..789ce80de 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -315,7 +315,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1800,9 +1799,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py index f91cef3b5..a5f7f08c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 73bdd42ab..148169c36 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index 3650ed5d9..38d85b42a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1155,7 +1155,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py index da5ba556d..b376cda82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py index 53e1e9516..5aa6a17bb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py index fc49b483c..649ee42b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py index e31b819ff..da52d1d71 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py index fffd8e491..f3dd308be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py @@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays -from Configurables import SubPIDMMFilter # Default configuration dictionary default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py index 9084c61c0..2e6227101 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py index 13669f766..07fcaee5f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py index 5ff751290..94ae3fe82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py @@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdLooseMergedPi0, StdLooseResolvedPi0) -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID __author__ = 'Andrea Contu' __date__ = '04/10/2010' __version__ = '$Revision: 1.5 $' @@ -85,7 +85,6 @@ def makeD02kpipi0(name): str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))" str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)" str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc" - str_D0_Sidebands = "200*MeV" d0 = CombineParticles() d0.DecayDescriptor = str_D0_DecayDescriptor_RS diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py index 0b2215730..ad2959732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py @@ -12,19 +12,12 @@ Module for selecting Lb->Lambda_c+ pi ''' -from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, - StdAllNoPIDsProtons, StdNoPIDsUpPions, - StdLooseMuons, StdNoPIDsUpKaons, - StdLooseResolvedPi0, StdLooseMergedPi0) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from PhysSelPython.Wrappers import MergedSelection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py index bc246c589..42cf65a76 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py index 68d2ae631..99d49369a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py index 9fff4e975..0f2af87a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 187d4d700..422fa39bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py index 56531b5bc..1598c1f9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py index db1a8e674..db554d3a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py index 6515f84ca..ad9039b46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py @@ -21,12 +21,10 @@ confCcbar2LstLst = Ccbar2LstLstConf( name = 'Ccbar2LstLst', config = config_Ccba stream.appendLines( confCcbar2LstLst.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -70,22 +68,22 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - CcbarPT = config['CcbarPT'] - KaonProbNNk = config['KaonProbNNk'] - KaonPT = config['KaonPT'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonPT = config['ProtonPT'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] - Lst_TisTosSpecs = config['Lst_TisTosSpecs'] + config['TRCHI2DOF'] + config['CcbarPT'] + config['KaonProbNNk'] + config['KaonPT'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonPT'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] + config['Lst_TisTosSpecs'] """ Unbiased, require Hlt Tis diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py index 1baf5793c..98fdb7f11 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py index 699437c3b..28e46f5fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index e6a23c416..2efa73daa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index ddb88e195..909028912 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -61,12 +60,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py index 516985c59..9d41a780f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 39414a291..b17f83d53 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py index 21f73ebac..ce4daa121 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py index 8a272ad23..f0e46c0b4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py index eb64c1750..fa0dcf9a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py index 0c836118d..63e11ca5d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py index 3e2d953e5..8d75e01e9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py index 1df5d93b8..fcea01500 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py index 09c274076..4d314b69f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py index fbb6cc13c..c4c8bfdaa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py index 2b6300f56..578167c76 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py @@ -8,17 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdTightPions, StdNoPIDsKaons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdAllNoPIDsProtons, StdNoPIDsKaons, StdNoPIDsPions from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * from GaudiKernel.SystemOfUnits import MeV, mm, ns from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py index cd4fb8c12..c47838a89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py index 6a1293248..d0ef68a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py index cd9fc5146..84e599e9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '30/11/2016' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py index 718d39a23..722215da6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py @@ -15,9 +15,8 @@ B->charmless quasi 2-body selection from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '25/07/2014' __version__ = '$Revision: 2.8 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py index 373482252..901009730 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py index 7f0781e48..37ddfd772 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py @@ -26,9 +26,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py index b6ed5f7d6..213f6377b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py index a35d44f01..19e01960a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py index e878d0304..1bfb413fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py index be5394ee6..26bb8d6f6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py index ed24e9afa..a85b63d0f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py index 7122ae867..db0bacbfa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 98e460d75..193ff53fe --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py index 36ea85af4..7f9a438ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py index dde55525b..f12ace21a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py index 4580afecf..e5c6f3efd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index b53f616c9..7a979a9ea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py index aef03c619..760de6aa1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py index 58996ef52..611bd2bca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py @@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members: from StandardParticles import StdAllLooseANNKaons as MyLooseKaons from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py index 1fd6ba791..4f9c1afdf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py index b0e05de78..a56f353bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py index b3c5e6c8c..f8977b65f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py index f513b2eb8..86d97904e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py index 0dfb222d2..91e98da0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py index 5892ee9c6..213bb72f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py index f6702785b..52ebfc4be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py index 2641bd9d0..afba240ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '21/05/2015' __version__ = 'Stripping23' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -392,7 +391,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut @@ -597,7 +596,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py index 8067c7a6d..f09fc331b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py index b2c3ad4b4..19d8a03d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py index b19f47e92..8ab8cbe05 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 7b207e6c1..f15420286 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 92af0a7a1..81115d7fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py index 162aeb0dd..115a1c5c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index 329adac1d..66aa89c6a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py index 769c83ae0..f24af2698 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py index b9dfbf867..c7400e8e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py index 0901cc37b..8290b32fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py index 2c8d1c88b..b1034d405 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py index bc111971f..e70ca9d56 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 0c80077a3..5b5457511 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py index 9fd00b351..ff38d7bcf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py index 96a8666b5..5afe8fb66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index ff7ca8fc3..f0e488bfb --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py index 641201574..f27b71e4d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py @@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py old mode 100755 new mode 100644 index 9a14b8675..10dd86282 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 83239c94c..6e136b7ba 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py index 5607b756d..6a46e9597 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py index fefe1d342..802e8316c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py index 96f3dd5c1..89ec6575a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py index cd0f35790..5c0183ffd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -611,7 +610,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -648,7 +647,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -685,7 +684,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -722,7 +721,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -759,7 +758,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -796,7 +795,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py index 9a861cb09..b60a33fa5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py index ed8648686..f006ce35a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py index 5f50a6446..b7803b391 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py index 61aa4a7c3..99e1b1032 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py index 3b0409acb..0b95d6415 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py index 63052973a..d25cc78a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py index 04f7a2eaa..132e325c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -185,7 +184,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py index ca556fcd0..92b63ab8b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -267,7 +264,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py index 4edfcbbf7..2b5bbdd7a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -755,7 +754,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py index d6432a15e..31c1f92b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py index bf75d26a7..0fc805caf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py index 6ca6b394d..b1010c3cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py index 8004878d3..d717afb5c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py index 930ba6dd1..5c17fdff8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py index 0b8f07c8e..a162a42f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py @@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index ee13ea7fe..5e817ce46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index a131e40e3..7a1541f08 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy @@ -224,7 +223,6 @@ def makeD02hhll( _pionCuts = _pionCutsOLD + " & " + _ghostCut _eleCuts = _eleCutsOLD + " & " + _ghostCut - from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseMuPion diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 71165c716..e210c6918 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -347,7 +347,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py index d82de0a68..30b545399 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py index 857d348c5..ec6a57054 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py index fa3250a83..327a50012 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py index 4c7a52873..ec6e744b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py index 5d7a3369f..b7f50de19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index f59616873..38d1f1cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py index 1f1fb6fd6..c05fa9e4e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index f65a07782..2a6ac3e49 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py index ccee2be91..1f6d52b84 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py @@ -17,12 +17,11 @@ __author__ = ['IFT'] __date__ = '29/03/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLoosePions, StdNoPIDsProtons __all__ = ('HeavyIonIncLcForProtonPIDConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py index a915f2133..64496a63a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py index 16e2016d6..376c9f63f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py index f5989cd6b..6f1af3c69 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,14 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from LoKiPhys.functions import SOURCE -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 53e68cac2..d5239b2b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index c0dfb7ba8..250433bd8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 1a80cc957..c63358516 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py index fdfc79a58..ed393ad52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py @@ -17,17 +17,6 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon from StrippingUtils.Utils import getLineBuildersFromModule as _getter __author__ = 'Juan Palacios palacios@physik.uzh.ch' -import StrippingHeavyIonOpenCharm -import StrippingHeavyIonWMuNu -import StrippingHeavyIonConvertedPhoton -import StrippingHeavyIonDiMuon -import StrippingHeavyIonOthercc -import StrippingHeavyIonTopology -import StrippingHeavyIonGammaHadron -import StrippingHeavyIonTrackEffMuonTT -import StrippingHeavyIonTrackEffDownMuon -import StrippingHeavyIonD02KPiPi0 -import StrippingHeavyIonIncLcForProtonPID from sys import modules as _modules _this = _modules[__name__] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py index 1c381f645..b6bfb5f29 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py index da1ac5dd5..986b1718c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py index 75fad1a93..f7ae00ee0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 2fbd096e0..999ae0e27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py index 7f662d87e..75edb9aa5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py index 1cd5ccbaa..432c22256 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py index 514a5dde8..03356ebe0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py @@ -24,9 +24,8 @@ DY2MuMu4 (20-40GeV): StdAllLooseMuons & TrkPChi2>0.1% & P>10GeV & pT>3GeV __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py index 5a0368434..fdc374106 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py @@ -18,9 +18,8 @@ __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py index 67725bbba..6ff23d235 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index 0ad441ea8..0472121f4 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index c02471267..9d041d417 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py @@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py index 2981965bb..9d0f27dcf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py index ac4b3b9c5..54239d73e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py @@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0 from GaudiKernel.SystemOfUnits import GeV from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 59d45b25c..1a886e380 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py @@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py index d58edd684..fe88689a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index 6fd0fdcc5..7d202e58f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py index 111d837cb..01e67268d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py index 1d7798298..43046078d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py index 249c3f9ab..69b3d4273 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py index 0b5d595c5..ae8735231 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 11d394ddb..df33cc795 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index aa10ffcef..421ef28a3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py index 3fbf48b1f..f16a508b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index d522b8b50..3da8ccba4 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py index 7ef7290f4..d3358d522 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py index 7cdca666d..dae887a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py index 0bb2cccfd..03ee6a325 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py @@ -21,7 +21,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py index f262f43a0..82fb2760e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py index ed5c2136a..e1a140f93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py index 719ab092d..1bd1ad771 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index f62f8db8c..da12c39fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py index 0a37d40f9..75e825eb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py index 2250a080d..7ed3e8ea2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py index c0209e4a8..aedb7955e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py index 4d5da6cdc..e11f8912e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py index 427dc4aa1..695822b35 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -373,7 +370,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py index b7765b884..2ca7e7f98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py index 509cd9d83..1c05c4023 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -295,7 +293,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -331,7 +329,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py index 465f34ce3..9a6ac1b58 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py index 9c92c11a0..6e1b98b4e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 0ec257778..17e343584 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py index bf8f80ead..5ee373244 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py index 8f3f40d4d..d2cb8108d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py @@ -9,15 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py index ae80a6487..b82b80518 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py index 6dc1f3c32..20e7e7d7a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py index 33f47f29c..f56a4e55e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py index b876ae5d9..f15067d27 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections """ -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles @@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Violaine Bellee', 'Albert Puig'] __date__ = '08/04/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py index 6ed0f1ff2..f471cc532 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py @@ -25,7 +25,7 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py index 158db5f4c..30dd36648 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py index 53f415519..f105ed628 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py index 81d36d685..8bd9c599b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho' __date__ = '16/06/2014' __version__ = '$Revision: 3 $' @@ -768,7 +767,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py index 961fe2a14..c3380097f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py index 093b37f68..53ebfe877 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -268,7 +267,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py index 0725ecd79..9cac5b811 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py index 1e5733609..e42cad2ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams'] moduleName = 'DarkBoson' @@ -252,7 +247,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -274,7 +269,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -391,7 +386,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py index c04d6c7bc..703ec457e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py index fb11a2289..ecbacfd2c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -408,7 +408,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py index 0eb02eba0..af7182392 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py index df7f615d0..207773409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py index da78ba561..f1c66b71d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py index dff170300..1a3aa2f94 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1181,7 +1179,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1675,7 +1673,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2314,7 +2311,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py index 048e24b93..1311185e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py index 4d0e65fd6..e57d2f0f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py @@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py index ff5893ed3..3a3bda006 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py index 45ebc9b80..96da26c9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py index 59b26f2a2..5a42379b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py @@ -51,15 +51,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2150,7 +2146,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py index d9cca6b4a..efcddadd2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py index 8cd7c6388..bf1088a93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py index ea1f9b620..307ea9bc3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop old__author__ = ['G. Mancinelli, J Cogan'] __date__ = '14/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py index 5f1edbaaa..1b49cee09 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -189,14 +186,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py index 24bd5252a..12dee166b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py index 17cd5b71d..be298e6b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py index 4c6dd348f..7bce3fa7f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py index 314d6e309..d9b1a081f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py index 2deca338b..1cc8f4345 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py index bbf2f30af..165fed745 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -110,7 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -420,7 +417,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py index 8efb67709..fcbc8d4cc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py @@ -608,7 +608,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStarTauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1126,7 +1125,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1145,7 +1143,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2DstarPi = CombineParticles( @@ -1167,7 +1165,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1191,7 +1188,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1215,7 +1211,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1239,7 +1234,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1264,7 +1258,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1289,7 +1282,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1313,7 +1305,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1338,7 +1329,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1363,7 +1353,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1388,7 +1377,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1412,7 +1400,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1436,7 +1423,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1461,7 +1447,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1486,7 +1471,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1511,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1537,7 +1520,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1561,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1587,7 +1568,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1612,7 +1592,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1638,7 +1617,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1662,7 +1640,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1686,7 +1663,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1711,7 +1687,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1737,7 +1712,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py index 200bd7771..26632da67 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia'] __date__ = '08/05/2010' __version__ = '$Revision: 1.6 $' @@ -227,7 +225,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles") @@ -633,8 +631,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -754,7 +752,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -782,7 +780,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index ae6916ee1..50c775a99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py index e10913eb9..af26a4266 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py index 3ba91114e..81c8f0a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -135,7 +133,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -458,7 +455,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 34edcbc00..17422d926 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index e6930dfa5..d8e959730 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1014,7 +1010,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 81cc1e964..ebf213b79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py index d6b9ccd1a..12089da92 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -315,7 +315,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1800,9 +1799,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py index d8fe4ecbe..f3909f84f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 75de6af8f..8c0987ed6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index cf3d996a2..5fb005dfa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1155,7 +1155,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py index cb2d7ea8c..d3d0bded7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py index 32740a839..2d291c57b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py @@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays -from Configurables import SubPIDMMFilter # Default configuration dictionary default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py index c48e6cd92..a85cf01b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py index 4e9947b7e..20a9a0349 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py @@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdLooseMergedPi0, StdLooseResolvedPi0) -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID __author__ = 'Andrea Contu' __date__ = '04/10/2010' __version__ = '$Revision: 1.5 $' @@ -86,7 +86,6 @@ def makeD02kpipi0(name): str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))" str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)" str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc" - str_D0_Sidebands = "200*MeV" d0 = CombineParticles() d0.DecayDescriptor = str_D0_DecayDescriptor_RS diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py index 34b20cffa..12591c473 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py @@ -12,19 +12,12 @@ Module for selecting Lb->Lambda_c+ pi ''' -from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, - StdAllNoPIDsProtons, StdNoPIDsUpPions, - StdLooseMuons, StdNoPIDsUpKaons, - StdLooseResolvedPi0, StdLooseMergedPi0) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from PhysSelPython.Wrappers import MergedSelection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py index e880430a5..fa5afb673 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py index 93c8ad489..a15c69b63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py index ba5bfcce7..f711b5e65 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py index 8a3c40d6d..a589ceeb1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py index 8a70403dd..d421f354b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py index e6bad3da5..2c1172dbb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Oliver Gruenberg"] __date__ = "07.12.2015" __version__ = "$Revision: 2.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py index 7bf48ad34..e8e50e609 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '30/11/2016' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py index 227b08ce5..f04e44b1b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py index f1095b036..ef02d37ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py index 2463c7b70..f78ff4257 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py index 3672d2598..5a03142a7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py index cc743704a..1f66a1746 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index a98f9f87f..fc4400565 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py index f2cbc909a..d8de299e3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py @@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members: from StandardParticles import StdAllLooseANNKaons as MyLooseKaons from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py index c2e428e39..61dc7972f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -267,8 +266,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -301,7 +300,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -352,7 +351,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -368,7 +367,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -540,7 +539,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index c458c3e6c..98fad852e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 6c6f284aa..4afa986a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py index b8f25c655..7fd939520 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index ac92a6c8c..c14b9b11f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py index bd7db7dbc..b5eea4d7c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index 2ba67af33..24016b458 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py index bf94193e8..c7194bf19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py index e464daa38..3d23ab459 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py index fa526c7de..5315ade7f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 2befca63e..85aec575e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py index e82b56942..e6940ae61 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py index c9b3c9d60..ee9bc7b3c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 155b6c9c0..9a57840a9 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py index 209c32e07..f0d7ae5fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py @@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py old mode 100755 new mode 100644 index d0fa14fab..934794e6e --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 316195569..25cd049b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py index d9497b537..3ac31a1bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py index a2634fb25..1da556644 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -245,7 +242,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py index 157505331..3c27a0af5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py @@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 5cd1680c5..1a859d894 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py index 5f63de83b..ca9621552 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py index 94eff4bff..359b595a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py index 0c2b044b5..e97c2ed82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py index 8b2646261..0c56eb326 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py index 6a1c04830..8308d72b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,14 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from LoKiPhys.functions import SOURCE -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index ce5d14b92..10036bf8e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 353e33b90..e7b8a3494 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c91e15eca..9b65c2764 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py index 5daef51c8..6dc68e5b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py @@ -17,18 +17,8 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon from StrippingUtils.Utils import getLineBuildersFromModule as _getter __author__ = 'Juan Palacios palacios@physik.uzh.ch' -import StrippingHeavyIonOpenCharm -import StrippingHeavyIonWMuNu # import StrippingHeavyIonConvertedPhoton -import StrippingHeavyIonDiMuon -import StrippingHeavyIonOthercc -import StrippingHeavyIonTopology # import StrippingHeavyIonGammaHadron -import StrippingHeavyIonTrackEffMuonTT -import StrippingHeavyIonTrackEffDownMuon -import StrippingHeavyIonD02KPiPi0 -import StrippingHeavyIonMiniBias -import StrippingHeavyIonSingleElectron from sys import modules as _modules _this = _modules[__name__] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py index e1e5fb0be..25b226c2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py index 5b0be7ca6..ce06625ea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 167e32419..10f3e69f1 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py @@ -28,10 +28,10 @@ Hlt2ExoticaPrmptDiMuonHighMass """ -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py index 9f9b7b90a..cf5af4522 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py index 0e662ae5f..73441ff9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py @@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0 from GaudiKernel.SystemOfUnits import GeV from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 2bf574eb7..a9d1c9602 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py @@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py index 16654f3c9..f93bc4732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py index bad4ad035..6334bd68b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py index 2624678f1..36fb89fcb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py index 578635fa7..9c45d8c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 295b8a41d..bb3326270 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index ae80ec7c3..48a0b2de2 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py index 7fa4e34f7..3773946c3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py index bd5cec16f..6ba3cd223 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -240,7 +238,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -276,7 +274,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py index a054613d0..fa7711103 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py index 8e508e6b1..d21cafebb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py index 517783103..a0b9fd618 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py @@ -9,15 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py index 525f26baa..b82d67faa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py index 2e6bf7874..9a9cce9fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections """ -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles @@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Violaine Bellee', 'Albert Puig'] __date__ = '08/04/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py index 83814baf1..d1be9584f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py index 86510ca26..4845bae8a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py index 63c81011d..f267e32df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho' __date__ = '16/06/2014' __version__ = '$Revision: 3 $' @@ -766,7 +765,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py index 9cbd23ab6..5f0ed1ef9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams'] moduleName = 'DarkBoson' @@ -251,7 +246,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -273,7 +268,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -390,7 +385,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py index a27f2b802..8aa7364b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -378,7 +378,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py index 45b59c0fd..832334778 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py index 74fd08ad3..a7307b99e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1177,7 +1175,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1684,7 +1682,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2324,7 +2321,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py index 8c5b2ce8e..c42df20fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py index 6acafdde8..d433a7839 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py @@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py index a24627bc3..ff85ddd92 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py index f328a4ad4..00749766b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py index 5671eec29..47ad42c66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py index fd8d8fb2b..ea376d1a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py index 0fa1d0bb4..3f1895420 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py index 6130e13de..e91f29e3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py index 227d8a809..0dc895bd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -417,7 +414,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -434,7 +431,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -451,7 +448,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py index a13e9a7e3..0a377c80f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py @@ -492,7 +492,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStarTauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1010,7 +1009,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1029,7 +1027,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2DstarPi = CombineParticles( @@ -1051,7 +1049,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1075,7 +1072,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1099,7 +1095,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1123,7 +1118,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1148,7 +1142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1173,7 +1166,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1197,7 +1189,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1222,7 +1213,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1247,7 +1237,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1272,7 +1261,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1296,7 +1284,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1320,7 +1307,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1345,7 +1331,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1370,7 +1355,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1395,7 +1379,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1421,7 +1404,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1445,7 +1427,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1471,7 +1452,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1496,7 +1476,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1522,7 +1501,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1546,7 +1524,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1570,7 +1547,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1595,7 +1571,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1621,7 +1596,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py index 9d03d6dd6..8346c4221 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia'] __date__ = '08/05/2010' __version__ = '$Revision: 1.6 $' @@ -221,7 +219,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles") @@ -627,8 +625,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -748,7 +746,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -776,7 +774,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py index 6ff148861..9661c75a7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py index d101d6736..07e3c0f58 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 98d9454e3..ca1071c46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 098bb6abd..45db0c074 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py index 07219a0d2..09096eb19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index d69562e93..51b7aaa9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py index e348ef543..7ddeef246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 541ddeee2..78bf5b565 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1014,7 +1010,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index b6f87b17a..ee3e55145 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 97d0925f7..5d9ad7c30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 9296ddf6f..d9598e8c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py index fd77399ae..789ce80de 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -315,7 +315,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1800,9 +1799,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py index f91cef3b5..a5f7f08c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 73bdd42ab..148169c36 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index 3650ed5d9..38d85b42a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1155,7 +1155,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index da5ba556d..b376cda82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py index 53e1e9516..5aa6a17bb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py index fc49b483c..649ee42b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py index e31b819ff..da52d1d71 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py index fffd8e491..f3dd308be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py @@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays -from Configurables import SubPIDMMFilter # Default configuration dictionary default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py index 9084c61c0..2e6227101 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py index 13669f766..07fcaee5f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py index 5ff751290..94ae3fe82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py @@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdLooseMergedPi0, StdLooseResolvedPi0) -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID __author__ = 'Andrea Contu' __date__ = '04/10/2010' __version__ = '$Revision: 1.5 $' @@ -85,7 +85,6 @@ def makeD02kpipi0(name): str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))" str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)" str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc" - str_D0_Sidebands = "200*MeV" d0 = CombineParticles() d0.DecayDescriptor = str_D0_DecayDescriptor_RS diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py index 0b2215730..ad2959732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py @@ -12,19 +12,12 @@ Module for selecting Lb->Lambda_c+ pi ''' -from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, - StdAllNoPIDsProtons, StdNoPIDsUpPions, - StdLooseMuons, StdNoPIDsUpKaons, - StdLooseResolvedPi0, StdLooseMergedPi0) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from PhysSelPython.Wrappers import MergedSelection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index bc246c589..42cf65a76 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 68d2ae631..99d49369a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py index 9fff4e975..0f2af87a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 187d4d700..422fa39bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py index 56531b5bc..1598c1f9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py index db1a8e674..db554d3a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py index 6515f84ca..ad9039b46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -21,12 +21,10 @@ confCcbar2LstLst = Ccbar2LstLstConf( name = 'Ccbar2LstLst', config = config_Ccba stream.appendLines( confCcbar2LstLst.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -70,22 +68,22 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - CcbarPT = config['CcbarPT'] - KaonProbNNk = config['KaonProbNNk'] - KaonPT = config['KaonPT'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonPT = config['ProtonPT'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] - Lst_TisTosSpecs = config['Lst_TisTosSpecs'] + config['TRCHI2DOF'] + config['CcbarPT'] + config['KaonProbNNk'] + config['KaonPT'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonPT'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] + config['Lst_TisTosSpecs'] """ Unbiased, require Hlt Tis diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 1baf5793c..98fdb7f11 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py index 699437c3b..28e46f5fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index e6a23c416..2efa73daa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index ddb88e195..909028912 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -61,12 +60,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py index 516985c59..9d41a780f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 39414a291..b17f83d53 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py index 21f73ebac..ce4daa121 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py index 8a272ad23..f0e46c0b4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py index eb64c1750..fa0dcf9a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py index 0c836118d..63e11ca5d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py index 3e2d953e5..8d75e01e9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py index 1df5d93b8..fcea01500 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py index 09c274076..4d314b69f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py index fbb6cc13c..c4c8bfdaa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py index 2b6300f56..578167c76 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py @@ -8,17 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdTightPions, StdNoPIDsKaons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdAllNoPIDsProtons, StdNoPIDsKaons, StdNoPIDsPions from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * from GaudiKernel.SystemOfUnits import MeV, mm, ns from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py index cd4fb8c12..c47838a89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py index 6a1293248..d0ef68a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py index cd9fc5146..84e599e9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '30/11/2016' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py index 718d39a23..722215da6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py @@ -15,9 +15,8 @@ B->charmless quasi 2-body selection from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '25/07/2014' __version__ = '$Revision: 2.8 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py index 373482252..901009730 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py index 7f0781e48..37ddfd772 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py @@ -26,9 +26,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py index b6ed5f7d6..213f6377b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py index a35d44f01..19e01960a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py index e878d0304..1bfb413fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py index be5394ee6..26bb8d6f6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py index ed24e9afa..a85b63d0f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py index 7122ae867..db0bacbfa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 98e460d75..193ff53fe --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py index 36ea85af4..7f9a438ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py index dde55525b..f12ace21a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 4580afecf..e5c6f3efd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index b53f616c9..7a979a9ea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py index aef03c619..760de6aa1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py index 58996ef52..611bd2bca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members: from StandardParticles import StdAllLooseANNKaons as MyLooseKaons from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py index 1fd6ba791..4f9c1afdf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py index b0e05de78..a56f353bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index b3c5e6c8c..f8977b65f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py index f513b2eb8..86d97904e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py index 0dfb222d2..91e98da0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py index 5892ee9c6..213bb72f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py index f6702785b..52ebfc4be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py index 2641bd9d0..afba240ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '21/05/2015' __version__ = 'Stripping23' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -392,7 +391,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut @@ -597,7 +596,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py index 8067c7a6d..f09fc331b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py index b2c3ad4b4..19d8a03d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py index b19f47e92..8ab8cbe05 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 7b207e6c1..f15420286 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 92af0a7a1..81115d7fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py index 162aeb0dd..115a1c5c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index 329adac1d..66aa89c6a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py index 769c83ae0..f24af2698 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py index b9dfbf867..c7400e8e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py index 0901cc37b..8290b32fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py index 2c8d1c88b..b1034d405 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py index bc111971f..e70ca9d56 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 0c80077a3..5b5457511 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py index 9fd00b351..ff38d7bcf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py index 96a8666b5..5afe8fb66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index ff7ca8fc3..f0e488bfb --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py index 641201574..f27b71e4d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py old mode 100755 new mode 100644 index 9a14b8675..10dd86282 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 83239c94c..6e136b7ba 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py index 5607b756d..6a46e9597 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py index fefe1d342..802e8316c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py index 96f3dd5c1..89ec6575a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py index cd0f35790..5c0183ffd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -611,7 +610,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -648,7 +647,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -685,7 +684,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -722,7 +721,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -759,7 +758,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -796,7 +795,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py index 9a861cb09..b60a33fa5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py index ed8648686..f006ce35a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py index 5f50a6446..b7803b391 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py index 61aa4a7c3..99e1b1032 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py index 3b0409acb..0b95d6415 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py index 63052973a..d25cc78a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py index 04f7a2eaa..132e325c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -185,7 +184,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py index ca556fcd0..92b63ab8b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -267,7 +264,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py index 4edfcbbf7..2b5bbdd7a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -755,7 +754,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py index d6432a15e..31c1f92b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py index bf75d26a7..0fc805caf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py index 6ca6b394d..b1010c3cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py index 8004878d3..d717afb5c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py index 930ba6dd1..5c17fdff8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py index 0b8f07c8e..a162a42f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py @@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index ee13ea7fe..5e817ce46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index a131e40e3..7a1541f08 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy @@ -224,7 +223,6 @@ def makeD02hhll( _pionCuts = _pionCutsOLD + " & " + _ghostCut _eleCuts = _eleCutsOLD + " & " + _ghostCut - from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseMuPion diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 71165c716..e210c6918 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -347,7 +347,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py index d82de0a68..30b545399 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py index 857d348c5..ec6a57054 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py index fa3250a83..327a50012 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py index 4c7a52873..ec6e744b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py index 5d7a3369f..b7f50de19 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index f59616873..38d1f1cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py index 460d53ed6..ed6a09c84 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index f65a07782..2a6ac3e49 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py index a915f2133..64496a63a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py index 16e2016d6..376c9f63f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py index 79d11a44e..5184102da 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,14 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from LoKiPhys.functions import SOURCE -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 220458ec4..36e8b7fd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index f32657194..3a9bfbd3e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 1a80cc957..c63358516 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py index 2e29d89a4..ed393ad52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py @@ -17,17 +17,6 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon from StrippingUtils.Utils import getLineBuildersFromModule as _getter __author__ = 'Juan Palacios palacios@physik.uzh.ch' -import StrippingHeavyIonOpenCharm -import StrippingHeavyIonWMuNu -import StrippingHeavyIonConvertedPhoton -import StrippingHeavyIonDiMuon -import StrippingHeavyIonOthercc -import StrippingHeavyIonTopology -import StrippingHeavyIonGammaHadron -import StrippingHeavyIonTrackEffMuonTT -import StrippingHeavyIonTrackEffDownMuon -import StrippingHeavyIonD02KPiPi0 -import StrippingHeavyIonMiniBias from sys import modules as _modules _this = _modules[__name__] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py index 1c381f645..b6bfb5f29 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py index da1ac5dd5..986b1718c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py index 75fad1a93..f7ae00ee0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 2fbd096e0..999ae0e27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py index 7f662d87e..75edb9aa5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py index 1cd5ccbaa..432c22256 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py index 514a5dde8..03356ebe0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py @@ -24,9 +24,8 @@ DY2MuMu4 (20-40GeV): StdAllLooseMuons & TrkPChi2>0.1% & P>10GeV & pT>3GeV __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py index 5a0368434..fdc374106 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py @@ -18,9 +18,8 @@ __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py index 67725bbba..6ff23d235 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index 0ad441ea8..0472121f4 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index c02471267..9d041d417 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py @@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py index 2981965bb..9d0f27dcf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py index ac4b3b9c5..54239d73e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py @@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0 from GaudiKernel.SystemOfUnits import GeV from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 59d45b25c..1a886e380 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py @@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py index d58edd684..fe88689a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index 6fd0fdcc5..7d202e58f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py index 111d837cb..01e67268d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py index 1d7798298..43046078d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py index 249c3f9ab..69b3d4273 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py index 0b5d595c5..ae8735231 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 11d394ddb..df33cc795 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index aa10ffcef..421ef28a3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py index 3fbf48b1f..f16a508b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index d522b8b50..3da8ccba4 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py index 7ef7290f4..d3358d522 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py index 7cdca666d..dae887a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py index 0bb2cccfd..03ee6a325 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py @@ -21,7 +21,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py index f262f43a0..82fb2760e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py index ed5c2136a..e1a140f93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py index 719ab092d..1bd1ad771 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index f62f8db8c..da12c39fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py index 0a37d40f9..75e825eb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py index 2250a080d..7ed3e8ea2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py index c0209e4a8..aedb7955e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py index 4d5da6cdc..e11f8912e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py index 427dc4aa1..695822b35 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -373,7 +370,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py index b7765b884..2ca7e7f98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py index 509cd9d83..1c05c4023 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -295,7 +293,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -331,7 +329,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py index 465f34ce3..9a6ac1b58 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py index 9c92c11a0..6e1b98b4e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 0ec257778..17e343584 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py index bf8f80ead..5ee373244 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py index 8f3f40d4d..d2cb8108d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py @@ -9,15 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py index ae80a6487..b82b80518 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py index 6dc1f3c32..20e7e7d7a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py index 33f47f29c..f56a4e55e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py index b876ae5d9..f15067d27 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections """ -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles @@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Violaine Bellee', 'Albert Puig'] __date__ = '08/04/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py index 6ed0f1ff2..f471cc532 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py @@ -25,7 +25,7 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py index 158db5f4c..30dd36648 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py index 53f415519..f105ed628 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py index 81d36d685..8bd9c599b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho' __date__ = '16/06/2014' __version__ = '$Revision: 3 $' @@ -768,7 +767,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py index 961fe2a14..c3380097f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py index 093b37f68..53ebfe877 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -268,7 +267,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py index 0725ecd79..9cac5b811 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py index 1e5733609..e42cad2ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams'] moduleName = 'DarkBoson' @@ -252,7 +247,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -274,7 +269,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -391,7 +386,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py index c04d6c7bc..703ec457e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py index fb11a2289..ecbacfd2c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -408,7 +408,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py index 0eb02eba0..af7182392 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py index df7f615d0..207773409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py index da78ba561..f1c66b71d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py index dff170300..1a3aa2f94 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1181,7 +1179,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1675,7 +1673,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2314,7 +2311,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py index 048e24b93..1311185e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py index 4d0e65fd6..e57d2f0f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py @@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py index ff5893ed3..3a3bda006 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py index 45ebc9b80..96da26c9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py index 59b26f2a2..5a42379b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py @@ -51,15 +51,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2150,7 +2146,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py index d9cca6b4a..efcddadd2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py index 8cd7c6388..bf1088a93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py index ea1f9b620..307ea9bc3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop old__author__ = ['G. Mancinelli, J Cogan'] __date__ = '14/01/2014' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py index 5f1edbaaa..1b49cee09 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -189,14 +186,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py index 24bd5252a..12dee166b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py index 17cd5b71d..be298e6b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py index 4c6dd348f..7bce3fa7f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py index 314d6e309..d9b1a081f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py index 2deca338b..1cc8f4345 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index bbf2f30af..165fed745 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -110,7 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -420,7 +417,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py index 8efb67709..fcbc8d4cc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py @@ -608,7 +608,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStarTauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1126,7 +1125,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1145,7 +1143,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2DstarPi = CombineParticles( @@ -1167,7 +1165,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1191,7 +1188,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1215,7 +1211,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1239,7 +1234,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1264,7 +1258,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1289,7 +1282,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1313,7 +1305,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1338,7 +1329,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1363,7 +1353,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1388,7 +1377,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1412,7 +1400,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1436,7 +1423,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1461,7 +1447,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1486,7 +1471,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1511,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1537,7 +1520,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1561,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1587,7 +1568,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1612,7 +1592,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1638,7 +1617,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1662,7 +1640,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1686,7 +1663,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1711,7 +1687,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1737,7 +1712,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py index 200bd7771..26632da67 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia'] __date__ = '08/05/2010' __version__ = '$Revision: 1.6 $' @@ -227,7 +225,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles") @@ -633,8 +631,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -754,7 +752,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -782,7 +780,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index ae6916ee1..50c775a99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py index e10913eb9..af26a4266 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py index 3ba91114e..81c8f0a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -135,7 +133,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -458,7 +455,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py index 2f212b364..8ce24bba3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 2d1c9d69a..d86ed2e85 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1090,7 +1086,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 6f6b41a5a..4965e7a83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py index d4740efb1..c4e957ea4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -321,7 +321,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1820,9 +1819,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py index ac91c76ab..2a73dd8af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 4ca95e738..28ca931f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index b7be9235f..45e5b0dd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1333,7 +1333,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py index 1fe78df7c..4a7f7a1c5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py index 4d5f2c9be..3742d441c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 627203da2..283be918e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions -from StandardParticles import StdLoosePions, StdNoPIDsDownPions -from StandardParticles import StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '27/01/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py index ee8963df3..85282982e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py index d3d1d1ace..af48f7c83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '25/1/2019' @@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 201c09624..5b13bff30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py index a06a38a50..6feefa7e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,13 +18,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py index 55d3c83dd..860ca3a5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py index 10321ae53..4002bd8ca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py @@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py index bb255a96f..f8813f46f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py index c9b61ca02..03011c3e3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py @@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel' 'Markus Roehrken'] __date__ = '22/11/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py index 23c63deba..77385a7d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 08e7ce501..6156fdca3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 331ebd34b..a1e805b96 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py index b0efbccbb..a431e7b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index caaa8b1b8..7a1c97e88 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py index 836cb251b..d9859abdb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index ee8e55374..5e9f1e9a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py index f8385e403..1b5dd98b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py index c938bbfa4..96d9c5923 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py index 484737563..9647c11e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 914c4a47c..5969dfaaf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py index f3872175c..65099ba32 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py index b93a420e3..1a0ca1d60 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 21183c23c..c1b3a3d27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py index e4b5dcdd3..2813f15a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 1932ea736..397b76425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py index f493f6bd9..e0da6bf83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHGammaLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py index 59e1a9cc7..4bebda093 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py @@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py index 5f63de83b..ca9621552 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py index 77f8f1aec..84c4dbd80 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 72cca8370..6a64eaaf4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -26,9 +26,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py index a12003022..30062540e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -18,8 +18,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 3e9938914..1ee8e4e5f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -14,10 +14,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -37,7 +35,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py index 9c9f7e8b8..2cbcb83cf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -18,8 +18,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py index 2f680aef7..d5f91430b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -38,7 +38,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py index a6d5c96af..17a979d3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py @@ -13,13 +13,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index c29bc2f38..fdb6e9f0e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -44,34 +44,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index e0f6c33d1..62c1c335c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,12 +63,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig -from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons +from StrippingUtils.Utils import LineBuilder +from StandardParticles import StdAllLooseMuons, StdLooseKaons from Configurables import (MuonCombRec, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c6fe44cbc..f86ec2436 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -41,17 +41,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -60,14 +57,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py index a80a06710..3a4d7395f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py index 5fef3562a..28c1bab64 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py index 1ceed257a..66be8a1f8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 6bc342e66..6bb564d6b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py @@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py index 0e20ce2d9..b2931713d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py index a44e21b9d..b2b088c78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '24/01/2019' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py index 16654f3c9..f93bc4732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py index 60a35abe1..db8af2aec 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py index 46e50bf48..130bda526 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py index 63378eabc..335898343 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 2205ce56d..4927224c3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 69b6940c4..a8dd17366 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py index 121398b27..9c2efbbac 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '26/01/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py index 9025207d0..b89aef24e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py index 4fcaf356c..d2ac23a90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '28/09/2018' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py index ccdadc651..c8fca833f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi' @@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons from StandardParticles import StdLooseProtons as Protons - from StandardParticles import StdAllLoosePions as AllPions from StandardParticles import StdAllLooseKaons as AllKaons from StandardParticles import StdAllLooseProtons as AllProtons from StandardParticles import StdLooseKstar2Kpi as Kstars @@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder): ##################################################### def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py index 67d107ee8..22bd7388a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py @@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons from StandardParticles import StdNoPIDsUpPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py index c3458781e..2e36db58c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1716,7 +1714,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2356,7 +2353,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py index 6adb37dd0..b2fa9b13c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py index 5336bea5b..3736f8630 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py index 6130e13de..e91f29e3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 1d97e42a9..4d4fe19ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py index 7e086d886..6ace30c6e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py @@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 074ba01a4..729f75ac3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index fe0a253f8..ffae21292 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1086,7 +1082,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 6f6b41a5a..4965e7a83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py index d4740efb1..c4e957ea4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -321,7 +321,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1820,9 +1819,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py index dc43b1632..f42a406d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 9dfd8470c..304f50b86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index 8547d13a6..ca6aa38db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1229,7 +1229,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py index 74b42e7c6..f05790e87 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py index 0a3cd69c1..a71764e5d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py index 4e325a907..8a9c6f281 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py index 6e80dee94..75fac29b6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py index 8a3c40d6d..a589ceeb1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py index 8a70403dd..d421f354b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py index 7bf48ad34..e8e50e609 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '30/11/2016' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py index f1095b036..ef02d37ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py index cd845ff93..cd83fed3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py index c9b61ca02..03011c3e3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py @@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel' 'Markus Roehrken'] __date__ = '22/11/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py index c2e428e39..61dc7972f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -267,8 +266,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -301,7 +300,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -352,7 +351,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -368,7 +367,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -540,7 +539,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py index 9a4b9e30d..a8cd38477 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '28/02/2018' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -215,8 +214,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -271,8 +270,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -305,7 +304,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -356,7 +355,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -372,7 +371,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -544,7 +543,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -595,7 +594,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -611,7 +610,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index c458c3e6c..98fad852e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 6f3f2812e..c0a1239d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py index b8f25c655..7fd939520 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index ac92a6c8c..c14b9b11f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py index bd7db7dbc..b5eea4d7c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index bb4921194..5d4808974 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py index 79ab8b919..4c669d1a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py index d6c25fb81..99db91def 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py @@ -13,7 +13,6 @@ Stripping line to mimic Electron Track Reconstruction Efficiency HLT2 line Tag and probe with VELO info for J/psi -> ee ''' -from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons @@ -23,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -41,10 +40,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['ALL'], @@ -150,7 +148,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -307,7 +304,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py index 849af6082..4e62d87ff 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py index 8ed3b7917..4a048294a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 868e856df..7fe001240 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py index b8575891b..5b97ce1b7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py index d200634cb..a45124cce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 924e2dbae..bf9bd8b1e --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py index 03f3836bd..b590cd28e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py @@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py old mode 100755 new mode 100644 index 1f8e2fed4..bd1a8d9f2 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 316195569..25cd049b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py index 157505331..3c27a0af5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py @@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py index 5f63de83b..ca9621552 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py index 77f8f1aec..84c4dbd80 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py index 0c2b044b5..e97c2ed82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py index 8b2646261..0c56eb326 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py index 9e96e4e01..8ee4ce0bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index ce5d14b92..10036bf8e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 353e33b90..e7b8a3494 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c91e15eca..9b65c2764 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py index a80a06710..3a4d7395f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py index 5fef3562a..28c1bab64 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py index 1ceed257a..66be8a1f8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 6bc342e66..6bb564d6b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py @@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py index 0e20ce2d9..b2931713d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 17fe1ffe1..d2e08a40d --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py @@ -127,7 +127,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py index 16654f3c9..f93bc4732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py index 60a35abe1..db8af2aec 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py index 46e50bf48..130bda526 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py index 63378eabc..335898343 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 2205ce56d..4927224c3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 69b6940c4..a8dd17366 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py index 109b0d412..d3bce8434 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -240,7 +238,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -276,7 +274,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py index a054613d0..fa7711103 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py index 8e508e6b1..d21cafebb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py index f07ddb810..80c413e93 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py index 83814baf1..d1be9584f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py index 90d4099a6..3c2ca0c04 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder' __date__ = '16/06/2014' __version__ = '$Revision: 3 $' @@ -714,7 +713,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py index 9cbd23ab6..5f0ed1ef9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams'] moduleName = 'DarkBoson' @@ -251,7 +246,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -273,7 +268,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -390,7 +385,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py index 38d033064..67e9f1cbe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -384,7 +384,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py index 5be28d212..119a6d67e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1177,7 +1175,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1670,7 +1668,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2310,7 +2307,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py index 8c5b2ce8e..c42df20fe 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py index 6acafdde8..d433a7839 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py @@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py index f328a4ad4..00749766b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py index 5671eec29..47ad42c66 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py index b5f34c927..406635314 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py index 6130e13de..e91f29e3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py index 290eb2789..fd48ad00e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py index f85e9edd4..d5e2a4760 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py @@ -498,7 +498,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStarTauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1048,7 +1047,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1067,7 +1065,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2DstarPi = CombineParticles( @@ -1089,7 +1087,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1112,7 +1109,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1137,7 +1133,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1161,7 +1156,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1185,7 +1179,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1210,7 +1203,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1235,7 +1227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1259,7 +1250,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1284,7 +1274,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1309,7 +1298,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1334,7 +1322,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1358,7 +1345,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1382,7 +1368,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1407,7 +1392,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1432,7 +1416,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1457,7 +1440,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1483,7 +1465,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1507,7 +1488,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1533,7 +1513,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1558,7 +1537,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1584,7 +1562,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1608,7 +1585,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1632,7 +1608,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1657,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1683,7 +1657,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py index 2030ab55b..855040885 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia'] __date__ = '08/05/2010' __version__ = '$Revision: 1.6 $' @@ -221,7 +219,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles") @@ -627,8 +625,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -748,7 +746,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -776,7 +774,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py index 2f212b364..8ce24bba3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 2d1c9d69a..d86ed2e85 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1090,7 +1086,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 6f6b41a5a..4965e7a83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py index d4740efb1..c4e957ea4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -321,7 +321,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1820,9 +1819,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py index ac91c76ab..2a73dd8af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 4ca95e738..28ca931f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index b7be9235f..45e5b0dd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1333,7 +1333,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py index 1fe78df7c..4a7f7a1c5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py index 4d5f2c9be..3742d441c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 627203da2..283be918e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions -from StandardParticles import StdLoosePions, StdNoPIDsDownPions -from StandardParticles import StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '27/01/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py index ee8963df3..85282982e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py index d3d1d1ace..af48f7c83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '25/1/2019' @@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 201c09624..5b13bff30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py index a06a38a50..6feefa7e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,13 +18,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py index 55d3c83dd..860ca3a5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py index 10321ae53..4002bd8ca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py @@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py index bb255a96f..f8813f46f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py index c9b61ca02..03011c3e3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py @@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel' 'Markus Roehrken'] __date__ = '22/11/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py index 23c63deba..77385a7d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 08e7ce501..6156fdca3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 331ebd34b..a1e805b96 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py index b0efbccbb..a431e7b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index caaa8b1b8..7a1c97e88 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py index 836cb251b..d9859abdb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index ee8e55374..5e9f1e9a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py index f8385e403..1b5dd98b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py index 13da09ea7..3670f2924 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -572,7 +568,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -592,7 +588,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -612,7 +608,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -884,7 +880,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py index c938bbfa4..96d9c5923 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py index 484737563..9647c11e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 914c4a47c..5969dfaaf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py index f3872175c..65099ba32 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py index b93a420e3..1a0ca1d60 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 21183c23c..c1b3a3d27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py @@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py index e4b5dcdd3..2813f15a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py @@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py index ffa92dea7..6df059e20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -43,30 +43,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 1932ea736..397b76425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py index f493f6bd9..e0da6bf83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHGammaLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py index 59e1a9cc7..4bebda093 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py @@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py index 5f63de83b..ca9621552 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py index 77f8f1aec..84c4dbd80 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py index b38a84b86..c8361ce17 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, ParticleTransporter, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py index 0c2b044b5..e97c2ed82 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py index df8ad92d7..42c4e6409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py @@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics. Based on those by Patrick K. ''' -from Configurables import RelInfoConeVariables from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Configurables import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic -from Gaudi.Configuration import * +from Configurables import FilterDesktop __author__ = 'Cesar da Silva' __date__ = '30/04/2017' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py index c63f00873..685921c79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py @@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics. Based on those by Patrick K. ''' -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Yanxi ZHANG, Emilie MAURICE' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py index 89ba90160..75ee902a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -31,8 +31,8 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiKernel.SystemOfUnits import GeV, MeV, mrad +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py index 68874ffb4..efc32ecd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdAllLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py index 4751a2767..ce4c263cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py @@ -14,7 +14,7 @@ Stripping selections for single scattered electrons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Giacomo Graziani' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py index 19f3d03c9..8308d72b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 6e7eb7567..0880e97b0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 56d4a18ef..3af84c0e2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 0e0704532..7cd8b2c0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py index a80a06710..3a4d7395f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py index 5fef3562a..28c1bab64 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py index 1ceed257a..66be8a1f8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 6bc342e66..6bb564d6b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py @@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py index 0e20ce2d9..b2931713d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py index a44e21b9d..b2b088c78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '24/01/2019' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py index 16654f3c9..f93bc4732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py index 60a35abe1..db8af2aec 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py index 46e50bf48..130bda526 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py index 63378eabc..335898343 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 2205ce56d..4927224c3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 69b6940c4..a8dd17366 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py index 121398b27..9c2efbbac 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '26/01/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py index 9025207d0..b89aef24e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py index 4fcaf356c..d2ac23a90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '28/09/2018' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py index ccdadc651..c8fca833f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi' @@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons from StandardParticles import StdLooseProtons as Protons - from StandardParticles import StdAllLoosePions as AllPions from StandardParticles import StdAllLooseKaons as AllKaons from StandardParticles import StdAllLooseProtons as AllProtons from StandardParticles import StdLooseKstar2Kpi as Kstars @@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder): ##################################################### def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py index 67d107ee8..22bd7388a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py @@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons from StandardParticles import StdNoPIDsUpPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py index c3458781e..2e36db58c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1716,7 +1714,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2356,7 +2353,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py index 6adb37dd0..b2fa9b13c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py index 5336bea5b..3736f8630 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py index 6130e13de..e91f29e3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py index 1d97e42a9..4d4fe19ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py index 7e086d886..6ace30c6e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py @@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 074ba01a4..729f75ac3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py index 8fdba29f0..e3ae45446 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 523cdae39..e1c610266 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py index b553711d6..2ca00a91b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py index 4c73451a5..0f5de6e61 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Gerwin Meier' __date__ = '2019/08/12' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py index 326fc7c34..b6ae6bfc4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 4837b0a43..04c8a298f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1399,7 +1395,7 @@ class B2DXBuilder(object): 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"] } - input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID + self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID inputs = { 'B2D0st2460D0K': self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index af663b759..7449f0734 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py index b68548ee7..5b18c6b24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -385,7 +385,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -2058,9 +2057,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles( # ( hasTopoChild() ) CombinationCut="ADAMASS('phi(1020)') < 150*MeV", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py index 08f113046..83e86c72d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 7673d8fca..3e955dda8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index a95fd4d83..6de0692b7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1649,7 +1649,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py index 7949e5482..84d6df196 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py index 1ec2da4c2..0711ca388 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py index 249d2b625..8bc0995e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdAllNoPIDsProtons, StdNoPIDsUpPions, StdLooseMuons, StdNoPIDsUpKaons, StdLooseResolvedPi0, StdLooseMergedPi0) -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py index c0e64ca5c..ce1d72039 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py @@ -15,9 +15,8 @@ Module for B_c->eta_c mu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '15/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py index 2d376003a..4fa26a1cb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py @@ -23,9 +23,8 @@ B_c->eta_c tau, with eta_c->K_s K pi and tau->3pi from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '24/06/2021' __version__ = '$Revision: 1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py index b6b5864ff..4fc4ffd7e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py @@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '07/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 8ce57a0eb..a92e180d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -18,14 +18,12 @@ Apply very loose P/PT cuts on proton and pions ''' from StandardParticles import StdAllLoosePions, StdAllLooseProtons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdNoPIDsDownProtons -from StandardParticles import StdNoPIDsProtons -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from StandardParticles import StdNoPIDsDownPions, StdNoPIDsDownProtons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov', 'Jinlin Fu', 'Ziyi Wang'] __date__ = '20/06/2021' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py index 7b897199b..247fee87e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py index f03d28c2c..89f19ca3d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '10/3/2020' @@ -178,10 +176,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py index 92ada5696..5547236ca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis', 'updated by Vitalii Lisovskyi'] __date__ = '19/05/2011' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 9e29771dd..de3a1066b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py index 9372dd979..9454a8ad6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,12 +18,9 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py index fa5c47368..2596756ef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py index 0ef3e6ee6..c9b94fd99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py @@ -15,7 +15,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Xijun Wang' __date__ = '2021-3-18' __version__ = 'Stripping28' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py index 8a70403dd..d421f354b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py index 6cb9b0c8a..445c8816a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py @@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0', 'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py index db2b4d65b..a6b52e064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py index 79abd1433..c90f7faea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py index 41030075a..e86c40013 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py index 0ec9c6a5d..0ba12bf37 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py @@ -23,7 +23,6 @@ __date__ = '05/02/2021' __version__ = 'Stripping29r2p2' __all__ = 'B2LambdapppLinesConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -214,8 +213,8 @@ class B2LambdapppLinesConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -270,8 +269,8 @@ class B2LambdapppLinesConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -304,7 +303,7 @@ class B2LambdapppLinesConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B0_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_DD_PTsum'] @@ -436,7 +435,7 @@ class B2LambdapppLinesConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B0_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_LD_PTsum'] @@ -452,7 +451,7 @@ class B2LambdapppLinesConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['B0_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['B0_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B0_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['B0_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 3ca4b3b86..5ffc4a205 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py index cc743704a..1f66a1746 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 1792d3977..ada24235b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py index c20e2b517..19a07b4fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py @@ -23,7 +23,6 @@ __date__ = '16/12/2020' __version__ = 'Stripping28' __all__ = 'Bu2KShConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -258,7 +257,7 @@ class Bu2KShConf(LineBuilder): _massCutLow = "(AM>(5279-%s)*MeV)" % config['B_Mlow'] _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2)>%s*MeV)" % config['BDaug_DD_PTsum'] _combCuts = _massCutLow diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py index d92d1478c..c412d7f27 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping29r2p1' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py index 54b56a996..7b8a9c8dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py @@ -27,7 +27,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Gediminas Sarpis', 'Hendrik Jage'] __date__ = '06/04/2021' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index c458c3e6c..98fad852e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 6c6f284aa..4afa986a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py index b8f25c655..7fd939520 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index ac92a6c8c..c14b9b11f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py index bd7db7dbc..b5eea4d7c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py index fd6d09033..c49382c89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py @@ -34,9 +34,8 @@ __all__ = ('StrippingDst2D0PiConf', 'makeDst2D0Pi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index c047319a0..64e2e6642 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -33,15 +33,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py index 72e0b978a..56eb58e21 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He', 'Vitalii Lisovskyi'] __date__ = '21/06/2021' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py index d630ed353..be5c53aa3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py @@ -25,12 +25,10 @@ __all__ = ('StrippingEta2MuMuGammaConf', 'makeMuMuGamma', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllLooseMuons default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py index e464daa38..3d23ab459 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py index fa526c7de..5315ade7f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index d2de08dbe..a43c58f87 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -29,7 +27,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+). __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py index 23bbe71b4..9232160ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py @@ -10,15 +10,12 @@ ############################################################################### from CommonParticles.Utils import trackSelector, updateDoD -from Configurables import NoPIDsParticleMaker, CombinedParticleMaker -from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsElectrons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import AutomaticData, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = 'Vitalii Lisovskyi' __date__ = '15/03/2021' __version__ = '$Revision: 0.0 $' @@ -29,7 +26,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+) for hadron->e ''' -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles @@ -649,7 +646,7 @@ def brempion_PMaker(name, Particle='pion') algorithm_pi.AddBremPhotonTo = ['pi+'] # configure the track selector - selector_pi = trackSelector(algorithm_pi) + trackSelector(algorithm_pi) # configure Data-On-Demand service updateDoD(algorithm_pi) # finally: define the symbol @@ -694,7 +691,7 @@ def bremkaon_PMaker(name, Particle='kaon') algorithm_K.AddBremPhotonTo = ['K+'] # configure the track selector - selector_K = trackSelector(algorithm_K) + trackSelector(algorithm_K) # configure Data-On-Demand service updateDoD(algorithm_K) # finally: define the symbol diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py index e82b56942..e6940ae61 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py index c9b3c9d60..ee9bc7b3c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 02a389d2c..ac589d4b1 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -49,35 +49,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py index 84b931c72..aae7dfa49 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -65,11 +65,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 316195569..25cd049b1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py index e71b5b307..41168201d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py @@ -23,7 +23,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Matt Rudolph'] __date__ = '2021/3/14' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py index 24931ab9d..1764c232d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py @@ -37,16 +37,12 @@ __version__ = '$Revision: 0.1 $' __all__ = ('StrippingCharmedBaryonSL', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -import sys +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_name = 'CharmedBaryonSL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py index eacf772b4..efe5ef893 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '03/19/2021' __version__ = '$Revision: 0.02 $' @@ -97,7 +95,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py index 7e19b796a..c3359cfd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun'] __date__ = '07/05/2019' __version__ = '$Revision: 0.01 $' @@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons + from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config) _mupid = StdAllLooseMuons if self._config["NoPIDmu"]: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py index d9497b537..3ac31a1bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py index bef9e3302..bcfa56160 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -21,18 +21,17 @@ __version__ = '$Revision: 1.1 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py index e7b224211..20835582f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py @@ -32,7 +32,6 @@ __version__ = '$Revision: 0.5 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -40,11 +39,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py index c55a09ec5..937669104 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py @@ -29,7 +29,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop # from StandardParticles import StdNoPIDsPions as InputPionsPiPi # from StandardParticles import StdNoPIDsKaons as InputKaons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py index d3888168f..2c9fd0089 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py @@ -24,11 +24,9 @@ __date__ = '13/10/2017' __all__ = ('default_config', 'StrippingHc2V03HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdAllLoosePions as InputPions from StandardParticles import StdAllLooseKaons as InputKaons -from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py index ae08b01f2..a730881c7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py @@ -17,12 +17,10 @@ Exported selection makers: 'makeLc', 'makeSigmac', 'makeSigmacWS', """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Marco Pappagallo'] __date__ = '17/03/2021' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py index 5cd5cf6bb..147241ad2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py @@ -31,13 +31,9 @@ __version__ = '$Revision: 1.1 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py index 91757124d..90176344c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py @@ -11,8 +11,6 @@ """ Exclusive lines for Xc+ -> Lambda0 KS0 h+ """ -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py index 8e47ddfa3..5a28d5b8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py @@ -13,10 +13,8 @@ Stripping lines for Xic+ -> Xi- pi+ pi+, Lc+ -> Xi- pi+ K+ and Xic+ -> Xi- pi+ K The lines are used to complement the inclusive Xi Turbo lines by adding Velo raw banks to study if the Xi- can be reconstructed as an upstream track. """ -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import ( - FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection) + FilterSelection, CombineSelection, Combine3BodySelection) from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py index 71b78eea7..d6856b0e1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py @@ -15,7 +15,7 @@ Exclusive lines for Xic+ -> Sigma0 KS0 pi+, Xic0 -> Sigma0 K- pi+ and Xic+ -> Si from CommonParticles.Utils import updateDoD from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import (FilterDesktop, ResolvedPi0Maker, PhotonMaker) +from Configurables import (ResolvedPi0Maker, PhotonMaker) from PhysConf.Selections import (FilterSelection, Combine3BodySelection, MergedSelection, SimpleSelection) from PhysSelPython.Wrappers import AutomaticData diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py index faf8ebc61..f1cf537f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py @@ -37,17 +37,12 @@ __version__ = '$Revision: 0.2 $' __all__ = ('StrippingXiccSL', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import TisTosParticleTagger -import sys default_name = 'XiccSL' @@ -381,7 +376,7 @@ class StrippingXiccSL(LineBuilder): _strCutMoth_Zero = "(CHILD(VFASPF(VZ),1) - VFASPF(VZ) > %(Omegacc_Lc_delta_VZ_Min)s)" \ "& (BPVDIRA > %(Omegacc_Zero_BPVDIRA_Min)s)" % self.config - _strCutMoth2 = _strChi2Moth2 + '&' + _strCutMoth + _strChi2Moth2 + '&' + _strCutMoth _strCutMoth2_Zero = _strChi2Moth2 + '&' + _strCutMoth_Zero ''' Stripping Omega_cc+ -> Omega_c0 mu+ ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py index 8e3831dcc..8a3816804 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Hendrik Jage', 'Gediminas Sarpis'] __date__ = '19/03/2021' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py index 46870fe2f..940b716b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py @@ -19,15 +19,12 @@ __version__ = 'v0r1' __all__ = ('HeMedianConf', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsProtons as Protons -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'HeMedian', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py index 6e86f2745..2b79ea417 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py @@ -19,15 +19,12 @@ __version__ = 'v0r1' __all__ = ('HeNOverflowsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsProtons as Protons -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'HeNOverflows', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py index 7006c283f..b23478e8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py index d76254846..d4ecc7b6f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py index df8b9c18c..9b8d406ef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py index 19f3d03c9..8308d72b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 4b221c471..bd21417c5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index d45ec02ac..e2e32a543 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig -from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons +from StrippingUtils.Utils import LineBuilder +from StandardParticles import StdAllLooseMuons, StdLooseKaons from Configurables import (MuonCombRec, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c0bb11bf8..38f843265 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py index 3ee7aeb4f..e7e59c7c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py @@ -24,7 +24,6 @@ __date__ = '19/03/2021' __version__ = 'v1r0' __all__ = {'Lb2V0pphhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py index c5a28128f..ad0fc42d4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py @@ -24,7 +24,6 @@ __all__ = ('Lb2dpXConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from StandardParticles import StdAllNoPIDsPions as Pions @@ -33,7 +32,6 @@ from StandardParticles import StdAllNoPIDsKaons as Kaons from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dpX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py index a5398df14..db69855d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py @@ -9,12 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from CommonParticles import StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py index 0a74c48c6..a3e372506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py @@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $' __all__ = ('B2EHNLLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons +from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py index 1b9907eed..ababbe64f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py @@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $' __all__ = ('B2MuHNLLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons +from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py index e1e5fb0be..25b226c2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py index 5b0be7ca6..ce06625ea 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 53d4e78db..8fde59168 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py @@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py index 9f9b7b90a..cf5af4522 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py index 00c3a16a5..f3d787247 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '23/06/2021' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV, picosecond -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py index 4db1eeb4f..3aec384d4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py @@ -14,10 +14,9 @@ Stripping lines selecting scalar long-lived particles decaying to hadrons """ -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py index 5e11c78ec..6aa23424c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py index bc00d02ab..a5598540a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py @@ -13,18 +13,14 @@ Lines for searches on DM candidates produced from Lambda decays (arXiv:2101.02706). """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * -from CommonParticles.Utils import * -from CommonParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseKaons, StdAllLooseProtons, StdAllLoosePions from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, picosecond, millimeter +from GaudiKernel.SystemOfUnits import MeV, millimeter __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Saul Lopez Solino'] __date__ = '18/03/2021' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py index bad4ad035..6334bd68b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py index 2624678f1..36fb89fcb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py index 578635fa7..9c45d8c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 295b8a41d..bb3326270 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index ae80ec7c3..48a0b2de2 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py index 3244d01c6..7c9eae26a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi; based on Bu2LLK lines' __date__ = '04/09/2019' __version__ = '$Revision: 1 $' @@ -112,7 +111,6 @@ class B2DibaryonMuMuConf(LineBuilder): # 2 : Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py index b614d11a7..6a856fa99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '04/09/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py index 60fc5ccbd..b1a382095 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'Vitalii Lisovskyi' __date__ = '18/06/2021' __version__ = '$Revision: 1 $' @@ -72,7 +71,6 @@ class B2KSKSMuMuConf(LineBuilder): # Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)&(PROBNNmu>0.01)))" SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py index 6547c8d92..9a503cdbd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He', 'Yanting Fan', 'Angel Campoverde'] __date__ = '17/06/2021' __version__ = '$Revision: 1.0 $' @@ -228,7 +226,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Di letpons """ - from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllLooseANNElectrons, StdLooseDiMuonSameSign, StdAllLooseMuons + from StandardParticles import StdAllLooseANNElectrons, StdAllLooseMuons, StdLooseDiMuonSameSign self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron", DecayDescriptor="[J/psi(1S) -> e+ e+]cc", @@ -296,7 +294,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -332,7 +330,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py index 56119a8de..28e6f3608 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py @@ -19,9 +19,7 @@ Note: from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Jibo He', 'Yanting Fan'] __date__ = '10/03/2021' __version__ = '$Revision: 1.0 $' @@ -194,7 +192,7 @@ class B2LLXBDT_CalibConf(LineBuilder): """ Di letpons """ - from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllNoPIDsElectrons, StdAllNoPIDsMuons + from StandardParticles import StdAllNoPIDsElectrons, StdAllNoPIDsMuons self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron", DecayDescriptor='J/psi(1S) -> e+ e-', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py index fa05d51ee..290a038e1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -21,7 +21,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py index 85a7ae0f5..be3956da7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # as FilterDesktop_GC -from GaudiKernel.SystemOfUnits import MeV -from CommonParticles.Utils import updateDoD from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from Configurables import (ResolvedPi0Maker, PhotonMaker) +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '05/03/2021' __version__ = '$Revision: 0 $' @@ -76,9 +72,7 @@ class B2OCMuMuConf(LineBuilder): BcLine_name = name+"Bc" BcNoPointLine_name = name+"BcNoPoint" - from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseProtons as Protons from StandardParticles import StdAllNoPIDsPions as AllPions from StandardParticles import StdAllNoPIDsKaons as AllKaons from StandardParticles import StdAllNoPIDsProtons as AllProtons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py index 018806639..e0f7a0afc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py index 1273eebf7..822bfb329 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py @@ -22,8 +22,6 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2XMuTauMuonicConf', 'default_config') -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py index 44cd40b22..f25de253e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau """ diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py index 8ce4944cc..78d80371d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py @@ -23,8 +23,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('B2XTauTauMuonicConf', 'default_config') -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py index a346ce2d2..85c93efc5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py @@ -32,14 +32,12 @@ __version__ = '$Revision: 0.0 $' __all__ = ('BaryonicLFVConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combine5Particles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'BaryonicLFV', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py index 1c734bb1d..61c847ace 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.2' __all__ = ('Beauty2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdAllNoPIDsMuons as Muons from StandardParticles import StdAllNoPIDsPions as Pions @@ -424,7 +422,7 @@ class Beauty2MajoLepConf(LineBuilder): def makeMu(self, name, config): # define all the cuts _bachPtCut = "(PT>%s*MeV)" % config['Lep_PTmin'] - _bachIPChi2Cut = "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min'] + "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min'] _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _pidMuon = '(ISMUON)' @@ -860,7 +858,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] - _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow'] + "(AM>(%s*MeV))" % config['Majo_AMlow'] _combCuts = _massCutHigh + '&'+_docaCut @@ -893,7 +891,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] - _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow'] + "(AM>(%s*MeV))" % config['Majo_AMlow'] _combCuts = _massCutHigh + '&'+_docaCut _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] @@ -1111,7 +1109,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutLow = "(AM>(%s*MeV))" % config['AM_Mlow'] _massCutHigh = "(AM<(%s*MeV))" % config['AM_Mhigh'] - _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] + "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] _combCuts = _massCutLow+'&'+_massCutHigh diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py index c9930debc..6a5687b69 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py index 138975959..80bf86657 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N5BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi, Biplab Dey' @@ -1733,7 +1733,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -2080,7 +2079,6 @@ class Bu2LLKConf(LineBuilder): ################################################################################################################################# def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py index 83456277a..d92e0c670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py @@ -11,7 +11,6 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from itertools import product from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DelegatingTrackSelector, CombineParticles, LoKi__VertexFitter from CommonParticles.Utils import * from StandardParticles import StdNoPIDsUpElectrons @@ -23,11 +22,9 @@ from StandardParticles import StdNoPIDsDownPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdLooseDownMuons from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Adrian Casais Vidal', 'Carla Marin', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py index 45b59c0fd..832334778 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py index 4a7726e9b..279eff2f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1778,7 +1776,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2418,7 +2415,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py index afbfe24d3..c83aa90e0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py @@ -12,8 +12,8 @@ from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, DaVinci__N5BodyDecays, DaVinci__N6BodyDecays +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, FilterDesktop from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '05/03/2021' @@ -100,14 +100,11 @@ class MultiLeptonConf(LineBuilder): Jpsi2Mu3EDetLine_name = name+'_Jpsi2Mu3EDetached' Jpsi2Mu3EPromptLine_name = name+'_Jpsi2Mu3EPrompt' - from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseProtons as Protons from StandardParticles import StdVeryLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD from StandardParticles import StdVeryLooseLambdaLL as LambdasLL from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdaLD as LambdasLD from StandardParticles import StdLoosePhi2KK as Phi2KK from StandardParticles import StdLooseKstar2Kpi as KstartoKpi from StandardParticles import StdLooseLambdastar2pK as Lstar diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py index e3c0eaddc..51ba747a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py @@ -12,11 +12,10 @@ from GaudiKernel.SystemOfUnits import MeV from CommonParticles.Utils import updateDoD from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection from Configurables import (ResolvedPi0Maker, PhotonMaker) from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import FilterDesktop as FilterDesktop_GC -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '26/02/2021' __version__ = '$Revision: 0 $' @@ -343,7 +342,6 @@ class RareBaryonicMuMuConf(LineBuilder): # 2 : Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe>0)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py index a24627bc3..ff85ddd92 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py index 1a58f8ff0..c9a1d99c7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py @@ -12,9 +12,8 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Dan Thompson; based on combination of Bu2LLK lines and Bs2st2KKMuXLine" __date__ = "14/06/2021" __version__ = "$Revision: 1$" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py index d2bc92f6c..f76088d68 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py @@ -36,7 +36,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -74,7 +73,7 @@ class Tau23MuLinesConf(LineBuilder): tau_name = name+'Tau23Mu' tau_name_DST = name+'Tau23Mu_DST' tau_name_DST_3mu = name+'Tau23Mu_DST_3mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' ds2PhiPi_name_DST = name+'Ds2PhiPi_DST' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py index 73f06f152..76ad4b5dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf', 'default_config') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -282,7 +279,6 @@ class B23MuNuConf(LineBuilder): ) # specify leptons to identify the muon candidate - RelInfoTools_fake_mumue = RelInfoTools_fake # RelInfoTools_fake_mumue[0] = { "Type" : "RelInfoMuonIDPlus", # "Variables" : ["MU_BDT"], # "DaughterLocations" : { @@ -416,14 +412,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, @@ -434,14 +429,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dielectron """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py index 51c5a39b0..3ffd86fc0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py index 34c3af4e6..efaa9d2a1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py index 59745cf95..8839d6b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py @@ -15,12 +15,7 @@ __version__ = '$Revision: 0.0 $' These are some lines for measuring the BF of Lc->pKpi and Ds->KKpi """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions __all__ = ('B2InvisAllLinesConf', 'default_config') @@ -267,7 +262,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ Filter ##### def _BpFilter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True) @@ -284,7 +279,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ same-sign Filter ##### def _Bp_SSFilter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi+]cc"], ReFitPVs=True) @@ -301,7 +296,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ fake proton Filter ##### def _Bp_fakeP_Filter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py index ab951b0df..bf18b6074 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -448,7 +445,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -465,7 +462,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -482,7 +479,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py index 27a551c0c..4a7e33c3b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py @@ -762,7 +762,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1633,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder): def __MakeTau23pi__(self): from PhysSelPython.Wrappers import DataOnDemand - from CommonParticles import StdLooseDetachedTauNoPID self.tau23piSel = DataOnDemand(Location=self.tau_path) @@ -1699,7 +1697,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterD02K3pi__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions, StdLooseKaons CombD02K3pi = CombineParticles( @@ -1720,7 +1718,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterD02K3piForDst__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions, StdLooseKaons CombD02K3piForDst = CombineParticles( @@ -1741,7 +1739,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterDstarD02K3pi__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions CombDstar2piD02K3pi = CombineParticles( @@ -1759,7 +1757,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterDstarD02K3piWS__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions CombDstar2piD02K3piWS = CombineParticles( @@ -1850,7 +1848,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1869,7 +1866,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1889,8 +1886,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1914,8 +1910,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1941,8 +1936,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1968,7 +1962,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1992,8 +1985,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2018,8 +2010,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2045,8 +2036,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2072,8 +2062,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2100,8 +2089,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2129,7 +2117,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2155,8 +2142,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D0(->K3pi) tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2183,8 +2169,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2213,7 +2198,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2241,8 +2225,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2268,8 +2251,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2296,7 +2278,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2320,8 +2301,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2347,8 +2327,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2376,7 +2355,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2401,8 +2379,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B_c+ -> J/psi(1S) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2428,7 +2405,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2452,8 +2428,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B_s0 -> D_s- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2479,8 +2454,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2507,7 +2481,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2532,8 +2505,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [Lambda_b0 -> Lambda_c+ tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2561,8 +2533,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2588,8 +2559,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [Lambda_b0 -> p+ tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2614,8 +2584,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2641,7 +2610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2668,8 +2636,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of inverted vertex cut only first, should boost the overall efficiency """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2695,8 +2662,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of inverted vertex cut only first, should boost the overall efficiency """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2720,8 +2686,7 @@ class B2XTauNuAllLinesConf(LineBuilder): Also useful for studying background in B0 -> D* tau nu when pi- from D** decay is missed """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2746,8 +2711,7 @@ class B2XTauNuAllLinesConf(LineBuilder): Also useful for studying WS background in B0 -> D* tau nu when pi+ from D** decay is missed """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2773,7 +2737,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2798,7 +2761,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2817,8 +2780,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D*0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2842,8 +2804,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2868,7 +2829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2892,7 +2852,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2911,8 +2871,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D*0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2936,8 +2895,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2962,7 +2920,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2985,7 +2942,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -3004,8 +2961,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3029,8 +2985,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3055,7 +3010,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -3078,7 +3032,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -3097,8 +3051,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3122,8 +3075,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3148,7 +3100,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py index 1bdf953d3..7dc32cd71 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py @@ -11,9 +11,7 @@ __author__ = ['Adam Davis'] __date__ = '12/03/2021' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder -import logging """ Selections for Bc -> Bs X @@ -144,7 +142,6 @@ class Bc2BsBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # GECs for # long tracks self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -463,7 +460,6 @@ class Bc2BsBuilder(LineBuilder): return self._Ds2KKpiSel from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions, StdAllLooseKaons _Ds2KKpi = CombineParticles( DecayDescriptors=["[D_s+ -> K+ K- pi+]cc"], @@ -486,7 +482,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions, StdAllLooseKaons _Phi2KK = CombineParticles( DecayDescriptors=["phi(1020) -> K+ K-"], @@ -508,7 +503,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLooseMuons _Jpsi2mumu = CombineParticles( DecayDescriptors=["J/psi(1S) -> mu+ mu-"], @@ -553,7 +547,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions _Bs2DsPi = CombineParticles( DecayDescriptors=["[ B_s0 -> D_s- pi+ ]cc", @@ -576,7 +569,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLooseKaons _Bs2DsK = CombineParticles( DecayDescriptors=["[ B_s0 -> D_s- K+ ]cc", "[B_s0 -> D_s+ K+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 827fcbc76..230adf6c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL, StdLooseLambdaLL, StdLooseLambdaDD -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseLambdaDD, StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py index 9003d470a..9d2d80fb9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py @@ -26,7 +26,7 @@ from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons # from StrippingSemilepISRUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from CommonParticles.Utils import * __all__ = ('SemilepISRAllLinesConf', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py index 2f212b364..8ce24bba3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 2d1c9d69a..d86ed2e85 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1090,7 +1086,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 6f6b41a5a..4965e7a83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py index d4740efb1..c4e957ea4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -321,7 +321,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1820,9 +1819,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py index ac91c76ab..2a73dd8af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 4ca95e738..28ca931f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index b7be9235f..45e5b0dd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1333,7 +1333,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py index 1fe78df7c..4a7f7a1c5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py index 4d5f2c9be..3742d441c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 627203da2..283be918e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions -from StandardParticles import StdLoosePions, StdNoPIDsDownPions -from StandardParticles import StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '27/01/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py index ee8963df3..85282982e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py index d3d1d1ace..af48f7c83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '25/1/2019' @@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 201c09624..5b13bff30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py index a06a38a50..6feefa7e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,13 +18,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py index 55d3c83dd..860ca3a5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py index 10321ae53..4002bd8ca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py @@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py index bb255a96f..f8813f46f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py index c9b61ca02..03011c3e3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py @@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel' 'Markus Roehrken'] __date__ = '22/11/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py index 23c63deba..77385a7d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 08e7ce501..6156fdca3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 331ebd34b..a1e805b96 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py index b0efbccbb..a431e7b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index caaa8b1b8..7a1c97e88 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py index 836cb251b..d9859abdb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index ee8e55374..5e9f1e9a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py index f8385e403..1b5dd98b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py index c938bbfa4..96d9c5923 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py index 484737563..9647c11e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 914c4a47c..5969dfaaf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py index f3872175c..65099ba32 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py index b93a420e3..1a0ca1d60 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 21183c23c..c1b3a3d27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py @@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py index e4b5dcdd3..2813f15a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py @@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 1932ea736..397b76425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py index f493f6bd9..e0da6bf83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHGammaLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py index 59e1a9cc7..4bebda093 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py @@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py index 5f63de83b..ca9621552 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py index 77f8f1aec..84c4dbd80 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py index 29327d8aa..294c1a30f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py @@ -22,10 +22,8 @@ from StandardParticles import StdLooseKaons as kaons from StandardParticles import StdLoosePions as pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Cameron Dean'] __date__ = '06/04/2020' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py index 39e4907aa..34f91df4e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('HeavyIonB2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py index 5df90d0f3..b288806e8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py index c01150078..7d5bc9da7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, ParticleTransporter, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py index 8f416b66b..0d7ba0992 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py index df8ad92d7..42c4e6409 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py @@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics. Based on those by Patrick K. ''' -from Configurables import RelInfoConeVariables from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Configurables import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic -from Gaudi.Configuration import * +from Configurables import FilterDesktop __author__ = 'Cesar da Silva' __date__ = '30/04/2017' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py index 106ff07bd..3c7b671fc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py @@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics. Based on those by Patrick K. ''' -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Yanxi ZHANG, Emilie MAURICE' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py index f63bb420d..79c0a039a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -32,7 +32,7 @@ __all__ = ( from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py index adacaca64..b3062d99f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py index 4751a2767..ce4c263cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py @@ -14,7 +14,7 @@ Stripping selections for single scattered electrons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Giacomo Graziani' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py index d53f7d8bf..0d62cf184 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 6e7eb7567..0880e97b0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 56d4a18ef..3af84c0e2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 0e0704532..7cd8b2c0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py index a80a06710..3a4d7395f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py index 5fef3562a..28c1bab64 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py index 1ceed257a..66be8a1f8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 6bc342e66..6bb564d6b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py @@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py index 0e20ce2d9..b2931713d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py index a44e21b9d..b2b088c78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '24/01/2019' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py index 16654f3c9..f93bc4732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py index 60a35abe1..db8af2aec 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py index 46e50bf48..130bda526 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py index 63378eabc..335898343 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 2205ce56d..4927224c3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 69b6940c4..a8dd17366 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py index 121398b27..9c2efbbac 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '26/01/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py index 9025207d0..b89aef24e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py index 4fcaf356c..d2ac23a90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '28/09/2018' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py index ccdadc651..c8fca833f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi' @@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons from StandardParticles import StdLooseProtons as Protons - from StandardParticles import StdAllLoosePions as AllPions from StandardParticles import StdAllLooseKaons as AllKaons from StandardParticles import StdAllLooseProtons as AllProtons from StandardParticles import StdLooseKstar2Kpi as Kstars @@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder): ##################################################### def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py index 67d107ee8..22bd7388a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py @@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons from StandardParticles import StdNoPIDsUpPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py index c3458781e..2e36db58c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1716,7 +1714,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2356,7 +2353,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py index 6adb37dd0..b2fa9b13c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py index 5336bea5b..3736f8630 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py index 6130e13de..e91f29e3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 1d97e42a9..4d4fe19ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py index 7e086d886..6ace30c6e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py @@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 074ba01a4..729f75ac3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py index 426a15a03..ea80a2693 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index f249942b6..83cfcf7fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py index 447acfd66..ccac3244d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py index 2f212b364..8ce24bba3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 2d1c9d69a..d86ed2e85 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1090,7 +1086,7 @@ class B2DXBuilder(object): "B- -> D*_2(2460)0 D0 K-"], 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]} - input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID + self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID, 'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID} rs = makeB2XSels(decays, '', inputs, self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index 6f6b41a5a..4965e7a83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py index d4740efb1..c4e957ea4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -321,7 +321,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -1820,9 +1819,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV", # ( hasTopoChild() ) MotherCut='(VFASPF(VCHI2/VDOF) < 10)', DaughtersCuts={'K+': '(PIDK>-10)'}, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py index ac91c76ab..2a73dd8af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 4ca95e738..28ca931f7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index b7be9235f..45e5b0dd4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1333,7 +1333,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py index 1fe78df7c..4a7f7a1c5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py index 0c33c7610..d01564ec9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py index 4d5f2c9be..3742d441c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import * from Beauty2Charm_HHBuilder import * from Beauty2Charm_DBuilder import * from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 627203da2..283be918e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions -from StandardParticles import StdLoosePions, StdNoPIDsDownPions -from StandardParticles import StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '27/01/2019' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py index ee8963df3..85282982e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py index d3d1d1ace..af48f7c83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '25/1/2019' @@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py index fdc48e45e..500f88291 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis'] __date__ = '19/05/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 201c09624..5b13bff30 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py index a06a38a50..6feefa7e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,13 +18,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py index 55d3c83dd..860ca3a5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py index 10321ae53..4002bd8ca 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py @@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py index fed913235..2c744f40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py index 58ec12b04..6de8763c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py index bb255a96f..f8813f46f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 782d89e74..99d5b7265 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py index c9b61ca02..03011c3e3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py @@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson', 'Emmy Pauline Maria Gabriel' 'Markus Roehrken'] __date__ = '22/11/2016' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 6179c70e7..7345868ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027% from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py index 23c63deba..77385a7d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping34' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index 08e7ce501..6156fdca3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 331ebd34b..a1e805b96 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py index b0efbccbb..a431e7b97 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index caaa8b1b8..7a1c97e88 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py index 836cb251b..d9859abdb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index ee8e55374..5e9f1e9a8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -31,15 +31,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py index f8385e403..1b5dd98b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py index c938bbfa4..96d9c5923 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py index 484737563..9647c11e7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index 914c4a47c..5969dfaaf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -42,7 +40,7 @@ StrippingReport INFO Event 100000 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py index f3872175c..65099ba32 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py index b93a420e3..1a0ca1d60 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 21183c23c..c1b3a3d27 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py @@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py index e4b5dcdd3..2813f15a2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py @@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 1932ea736..397b76425 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py index f493f6bd9..e0da6bf83 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHGammaLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py index 2ceba3956..0b1aa8422 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' @@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py index 2cf2e1f2d..3593748cd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py index 1a1c91b78..2cf7967d0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py index 59e1a9cc7..4bebda093 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py @@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py index 5f63de83b..ca9621552 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py index 77f8f1aec..84c4dbd80 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py @@ -27,11 +27,9 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py index bf6d16032..165e0fbf7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py @@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py index 96980e2e7..1bcf15d1c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py index fbf1fe772..ae9ee61c9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py @@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics. Based on those by Patrick K. ''' -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Yanxi ZHANG, Emilie MAURICE' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py index 30f90cfcf..2c107372d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py @@ -31,8 +31,8 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiKernel.SystemOfUnits import GeV, MeV, mrad +from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles, FilterDesktop from StandardParticles import ( StdAllNoPIDsKaons, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py index 46dcb8736..8a8385996 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsElectrons, StdAllLooseProtons, StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py index 4d96b7041..635480e78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py index 9e96e4e01..8ee4ce0bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index c4696149c..f38271598 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index 56d4a18ef..3af84c0e2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf', 'filterHLT2ForBJpsiK') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index 0e0704532..7cd8b2c0d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py index a80a06710..3a4d7395f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py index 5fef3562a..28c1bab64 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from CommonParticles.Utils import * # from Configurables import FilterDesktop # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py index 1ceed257a..66be8a1f8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 6bc342e66..6bb564d6b --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py @@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py index 0e20ce2d9..b2931713d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py index a44e21b9d..b2b088c78 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '24/01/2019' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py index 16654f3c9..f93bc4732 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py index 60a35abe1..db8af2aec 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py index 46e50bf48..130bda526 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py index 63378eabc..335898343 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 2205ce56d..4927224c3 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index 69b6940c4..a8dd17366 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py index 121398b27..9c2efbbac 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '26/01/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py index 0e62fb1a1..a236059c8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py @@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py index e8be53549..e6a830521 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py index 9025207d0..b89aef24e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py index 4fcaf356c..d2ac23a90 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '28/09/2018' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py index a19590514..5dd7a2cdc 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py index ccdadc651..c8fca833f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi' @@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons from StandardParticles import StdLooseProtons as Protons - from StandardParticles import StdAllLoosePions as AllPions from StandardParticles import StdAllLooseKaons as AllKaons from StandardParticles import StdAllLooseProtons as AllProtons from StandardParticles import StdLooseKstar2Kpi as Kstars @@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder): ##################################################### def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py index 67d107ee8..22bd7388a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py @@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons from StandardParticles import StdNoPIDsUpPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py index 5ac8f8363..d8b95bcb7 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py @@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin', 'Xabier Cid Vidal', 'Adrian Casais Vidal'] __date__ = '23/02/2018' __version__ = '$2.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py index c3458781e..2e36db58c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1716,7 +1714,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2356,7 +2353,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py index 95f70d0b6..98b3814df 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py index 6adb37dd0..b2fa9b13c 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py @@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder): # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config) tau_name = name+'Tau23Mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' tau25_name = name+'Tau25Mu' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py index 11d81c34f..6de21fe14 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -161,14 +158,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py index 5336bea5b..3736f8630 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py index 6130e13de..e91f29e3f 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py index 1d97e42a9..4d4fe19ad 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -437,7 +434,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -454,7 +451,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -471,7 +468,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py index 7e086d886..6ace30c6e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py @@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3pi/Particles') @@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 074ba01a4..729f75ac3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py b/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py old mode 100755 new mode 100644 index f10e7d7a0..6200459c7 --- a/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py +++ b/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py @@ -18,7 +18,6 @@ __all__ = ( 'StrippingConfigurableUser' ) -from GaudiConf.Configuration import * from Configurables import LHCbConfigurableUser diff --git a/Phys/StrippingConf/python/StrippingConf/StrippingStream.py b/Phys/StrippingConf/python/StrippingConf/StrippingStream.py old mode 100755 new mode 100644 index 938f48cb5..541504a04 --- a/Phys/StrippingConf/python/StrippingConf/StrippingStream.py +++ b/Phys/StrippingConf/python/StrippingConf/StrippingStream.py @@ -19,8 +19,7 @@ __all__ = ( ) from Gaudi.Configuration import * -from Gaudi.Configuration import GaudiSequencer, Sequencer, Configurable -from Configurables import LHCbConfigurableUser +from Gaudi.Configuration import GaudiSequencer from copy import copy @@ -87,7 +86,7 @@ class StrippingStream (object): line.declareAppended() def createConfigurables(self): - from Configurables import StrippingCheck + pass # Create configurables diff --git a/Phys/StrippingConf/tests/test_strippingline.py b/Phys/StrippingConf/tests/test_strippingline.py old mode 100755 new mode 100644 index 0023123a4..8ba8f0706 --- a/Phys/StrippingConf/tests/test_strippingline.py +++ b/Phys/StrippingConf/tests/test_strippingline.py @@ -42,7 +42,7 @@ def test_instantiate_from_Selection_object(): def test_duplicate_name_raises_ValueError(): - line0 = StrippingLine('DuplicateLine') + StrippingLine('DuplicateLine') raises(ValueError, StrippingLine, 'DuplicateLine') diff --git a/Phys/StrippingNeuroBayes/options/TestBhh.py b/Phys/StrippingNeuroBayes/options/TestBhh.py index 6b51868db..fd3961e2b 100644 --- a/Phys/StrippingNeuroBayes/options/TestBhh.py +++ b/Phys/StrippingNeuroBayes/options/TestBhh.py @@ -14,15 +14,12 @@ from Configurables import CondDB from Configurables import LoKi__Hybrid__TupleTool from Configurables import DecayTreeTuple from PhysSelPython.Wrappers import SelectionSequence -from PhysSelPython.Wrappers import MergedSelection from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import StrippingNBBhh -from os import environ from Gaudi.Configuration import * from Configurables import CombineParticles from Configurables import DaVinci -from GaudiKernel.SystemOfUnits import MeV, GeV ######################################################################## diff --git a/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py b/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py index dbaebe996..5cc10162c 100644 --- a/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py +++ b/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py @@ -14,15 +14,12 @@ from Configurables import CondDB from Configurables import LoKi__Hybrid__TupleTool from Configurables import DecayTreeTuple from PhysSelPython.Wrappers import SelectionSequence -from PhysSelPython.Wrappers import MergedSelection from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import StrippingNBMuMu -from os import environ from Gaudi.Configuration import * from Configurables import CombineParticles from Configurables import DaVinci -from GaudiKernel.SystemOfUnits import MeV, GeV ######################################################################## diff --git a/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py b/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py index f267e150c..24d98a384 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py @@ -17,7 +17,7 @@ # ######################################################################## -from Configurables import GaudiSequencer, CombineParticles +from Configurables import CombineParticles from StrippingConf.StrippingLine import StrippingLine PreselB2Charged2Body = CombineParticles("PreselB2Charged2Body") diff --git a/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py b/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py index a8fec07ca..0e5138047 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py @@ -14,11 +14,8 @@ # No StrippingMember functionality is used here. # -from os import environ from Gaudi.Configuration import * -from Configurables import DecayTreeTuple from Configurables import CombineParticles, FilterDesktop -from Configurables import TupleToolMCBackgroundInfo, TupleToolMCTruth, BackgroundCategory from StrippingConf.StrippingLine import StrippingLine ######################################################################## diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py index 1cc2e87e8..9ea7dc003 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py @@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection with loose PID cuts. ''' -from Gaudi.Configuration import * -from StrippingConf.StrippingLine import StrippingLine, StrippingMember +from StrippingConf.StrippingLine import StrippingLine from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -import GaudiKernel.SystemOfUnits as Units ################ # KS long long # diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py index f21298c8e..96d1a3f44 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py @@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection with loose PID cuts. ''' -from Gaudi.Configuration import * -from StrippingConf.StrippingLine import StrippingLine, StrippingMember -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -import GaudiKernel.SystemOfUnits as Units +from StrippingConf.StrippingLine import StrippingLine +from Configurables import CombineParticles, OfflineVertexFitter ####### # Kst # diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py b/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py index 60d4f66c3..496b88e82 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py @@ -11,9 +11,8 @@ # B->JpsiKstar selection # -from Gaudi.Configuration import * -from StrippingConf.StrippingLine import StrippingLine, StrippingMember -from Configurables import CombineParticles, FilterDesktop +from StrippingConf.StrippingLine import StrippingLine +from Configurables import CombineParticles Strip_Penguin_Jpsi2MuMu = CombineParticles('Strip_Penguin_Jpsi2MuMu') Strip_Penguin_Jpsi2MuMu.InputLocations = ["StdLooseMuons"] diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py b/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py index 4a0dad50e..4ae812a0c 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py @@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection with loose PID cuts. ''' -from Gaudi.Configuration import * -from StrippingConf.StrippingLine import StrippingLine, StrippingMember +from StrippingConf.StrippingLine import StrippingLine from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -import GaudiKernel.SystemOfUnits as Units ############################# # Standard Unbiased Phi->KK # diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py b/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py index f444d689c..9f186aecd 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py @@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection with loose PID cuts. ''' -from Gaudi.Configuration import * -from StrippingConf.StrippingLine import StrippingLine, StrippingMember -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -import GaudiKernel.SystemOfUnits as Units +from StrippingConf.StrippingLine import StrippingLine +from Configurables import CombineParticles, OfflineVertexFitter ###### # Bu # diff --git a/Phys/StrippingSelections/options/STEP09/StrippingTopo.py b/Phys/StrippingSelections/options/STEP09/StrippingTopo.py index ab0a849ca..d8f503517 100644 --- a/Phys/StrippingSelections/options/STEP09/StrippingTopo.py +++ b/Phys/StrippingSelections/options/STEP09/StrippingTopo.py @@ -13,7 +13,6 @@ # # Author: V. Gligorov -from os import environ from Gaudi.Configuration import * from Configurables import CombineParticles, FilterDesktop from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py index 8fdba29f0..e3ae45446 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py @@ -20,18 +20,10 @@ __date__ = '10/11/2016' __all__ = ('B2JpsiHHConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiHH', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py index 90740f80b..170baf2fb 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$' __all__ = ('B2JpsiPi0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py index 3f5f0443a..1bf462e00 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py @@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$' __all__ = ('B2JpsiPi0Conf_RI', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { # The real name of the lines is BetaS, this is a reference this for the Settings. diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py index d93a42cce..e15a04497 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py @@ -20,18 +20,10 @@ __date__ = '22/01/2018' __all__ = ('B2JpsiX0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiX0', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py index 523cdae39..e1c610266 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py @@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$' __all__ = ('B2JpsiXforBeta_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD from StandardParticles import StdLoosePions from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'BetaS', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py index b553711d6..2ca00a91b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Ramon Niet' __date__ = '2014/10/23' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py index 4c73451a5..0f5de6e61 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py @@ -8,16 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions -from CommonParticles.Utils import updateDoD from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Gerwin Meier' __date__ = '2019/08/12' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py index 326fc7c34..b6ae6bfc4 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya' __date__ = '2019/01/22' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py index b6e256eaa..30d69a2c1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Morgan Martin, Jibo He'] __date__ = '20/08/2014' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py index 933c2f46f..ee8bf0cf2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py @@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski' __date__ = '2011/03/01' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py index 4837b0a43..04c8a298f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py @@ -12,11 +12,7 @@ from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * -from Configurables import SubstitutePID # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# @@ -1399,7 +1395,7 @@ class B2DXBuilder(object): 'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"] } - input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID + self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID inputs = { 'B2D0st2460D0K': self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py index 63ecc8543..5bb9297a5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py @@ -8,11 +8,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py index 17eda4547..44526bcd7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py @@ -11,10 +11,8 @@ # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts +from PhysSelPython.Wrappers import MergedSelection from Beauty2Charm_Utils import * # from Configurables import SubstitutePID diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py index af663b759..7449f0734 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py @@ -10,9 +10,6 @@ ############################################################################### from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py index b68548ee7..5b18c6b24 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py @@ -385,7 +385,6 @@ class DBuilder(object): # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)] # use this below - d_cf_noMassWin = d_cf d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)]) ds_cf = LoKiCuts.combine( [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)]) @@ -2058,9 +2057,6 @@ class DBuilder(object): def _makeD2PhiMuNu(self, up=False): '''makes Ds->phi mu nu''' - decays = [['phi(1020)', 'mu+']] - min = '1125.13*MeV' - max = '2168.49*MeV' cpkk = CombineParticles( # ( hasTopoChild() ) CombinationCut="ADAMASS('phi(1020)') < 150*MeV", diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py index 08f113046..83e86c72d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py @@ -10,7 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py index 7673d8fca..3e955dda8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py @@ -10,9 +10,8 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from copy import deepcopy from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection from Beauty2Charm_LoKiCuts import LoKiCuts from Beauty2Charm_Utils import * diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py index 6f58dbe55..049552af8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py @@ -1704,7 +1704,7 @@ class Lb2XBuilder(object): def _makeX2LcKPiPiPi(self): '''Makes RS + WS Xib -> Lc HH + c.c.''' - pions = self.pions + self.pions kaons = self.kaons pipipi = self.hhh.pipipi config = deepcopy(self.config) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py index 54540ea2a..0fd327f8d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py index 7949e5482..84d6df196 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py @@ -10,13 +10,11 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection from Beauty2Charm_LoKiCuts import LoKiCuts from Configurables import SubstitutePID -from Configurables import ConeJetProxyFilter # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py index 830d1c343..ed453e6e9 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py @@ -19,18 +19,10 @@ __date__ = '29/11/2021' __all__ = ('B2D0X0Conf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdLooseProtons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2D0X0', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py index b0f8982f1..92ca95c2e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py @@ -15,8 +15,7 @@ Author: M. Martinelli Notes: Excited states are included by placing the line in FULL.DST ''' from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from Configurables import DaVinci__N4BodyDecays, FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Maurizio Martinelli'] diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py index 1ec2da4c2..0711ca388 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py @@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian'] __date__ = '09/11/2015' __version__ = '$Revision: 0.01 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm __all__ = ('B2DXD2HMuNuBuilder', 'default_config') diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py index 663bdbbf8..04c84fc2d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Rudolf Oldeman'] __date__ = '08/02/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py index 884208b81..fb3342063 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py @@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons, StdAllNoPIDsProtons, StdNoPIDsUpPions, StdLooseMuons, StdNoPIDsUpKaons, StdLooseResolvedPi0, StdLooseMergedPi0) -from Configurables import LoKi__VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * import re diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py index 69e18721b..030871800 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '13/03/2018' __version__ = '$Revision: 1.2$' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py index d3aeeef75..394fd7c31 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py @@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2JpsiXforEM_sConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import LoKi__PVReFitter, CombineParticles -from CommonParticles.Utils import updateDoD -from StandardParticles import StdLoosePions -from StandardParticles import StdLooseKaons -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdLooseResolvedPi0 -from StandardParticles import StdLooseMergedPi0 -from StandardParticles import StdNoPIDsPions -from StandardParticles import StdLooseProtons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV default_config = { 'NAME': 'B2JpsiXforEM', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py index 2c308991a..fd4e526f5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py @@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba stream.appendLines( confBbbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Simone Stracka'] __date__ = '10/03/2015' __all__ = ( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py index c0e64ca5c..ce1d72039 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py @@ -15,9 +15,8 @@ Module for B_c->eta_c mu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '15/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py index 2d376003a..4fa26a1cb 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py @@ -23,9 +23,8 @@ B_c->eta_c tau, with eta_c->K_s K pi and tau->3pi from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '24/06/2021' __version__ = '$Revision: 1.1 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py index d973f13d2..7b5a84a9d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/11/2013' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py index 946bad836..bd156feb8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '02/09/2010' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py index 58f89513d..39a304383 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py @@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Lucio Anderlini', 'Andrea Bizzeti'] __date__ = '2015-12-01' __version__ = '$Revision: 0.4 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py index e5a87f652..3e235742a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py @@ -20,7 +20,6 @@ stream.appendLines( [ ]) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py index b6b5864ff..4fc4ffd7e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py @@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Valeriia Zhovkovska'] __date__ = '07/03/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py index 8ce57a0eb..a92e180d7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py @@ -18,14 +18,12 @@ Apply very loose P/PT cuts on proton and pions ''' from StandardParticles import StdAllLoosePions, StdAllLooseProtons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdNoPIDsDownProtons -from StandardParticles import StdNoPIDsProtons -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from StandardParticles import StdNoPIDsDownPions, StdNoPIDsDownProtons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov', 'Jinlin Fu', 'Ziyi Wang'] __date__ = '20/06/2021' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py index 0c3177120..4937ef362 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py @@ -12,14 +12,10 @@ Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '23/11/2017' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py index cf2d3319f..fb7af6064 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py @@ -12,12 +12,10 @@ Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '12/01/2017' @@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder): self.name = name self.config = config - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonPTSec = config['KaonPTSec'] - ProtonProbNNp = config['ProtonProbNNp'] - ProtonP = config['ProtonP'] - ProtonPTSec = config['ProtonPTSec'] - LstVtxChi2 = config['LstVtxChi2'] - LstMinMass = config['LstMinMass'] - LstMaxMass = config['LstMaxMass'] - CombMaxMass = config['CombMaxMass'] - CombMinMass = config['CombMinMass'] - MaxMass = config['MaxMass'] - MinMass = config['MinMass'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonPTSec'] + config['ProtonProbNNp'] + config['ProtonP'] + config['ProtonPTSec'] + config['LstVtxChi2'] + config['LstMinMass'] + config['LstMaxMass'] + config['CombMaxMass'] + config['CombMinMass'] + config['MaxMass'] + config['MinMass'] self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name, InputList=DataOnDemand( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py index 28b6a56f5..91e5c78c6 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> p pbar pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '12/11/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py index c21b9fa87..101a8e21b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py @@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba stream.appendLines( confCcbar2PhiPhi.lines() ) ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/01/2012' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py index 9cece8aa8..8d48d19f4 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py @@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST ''' -from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He, Liupan An'] __date__ = '11/01/2017' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py index 3255f0fb2..8ded03963 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py @@ -12,12 +12,11 @@ Module for selecting charmonium -> phi phi pi pi ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Andrii Usachov'] __date__ = '10/04/2017' __version__ = '$Revision: 1.1 $' @@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder): self.name = name self.config = config - PhiVtxChi2 = config['PhiVtxChi2'] - PhiMassW = config['PhiMassW'] - KaonPT = config['KaonPT'] - TRCHI2DOF = config['TRCHI2DOF'] - KaonProbNNk = config['KaonProbNNk'] - KaonIPCHI2 = config['KaonIPCHI2'] + config['PhiVtxChi2'] + config['PhiMassW'] + config['KaonPT'] + config['TRCHI2DOF'] + config['KaonProbNNk'] + config['KaonIPCHI2'] self.SelPions = self.createSubSel(OutputList=self.name + "SelPions", InputList=DataOnDemand( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py index 7b897199b..247fee87e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py @@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Jibo He'] __date__ = '03/10/2010' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py index 0974ad33b..13c822775 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py @@ -11,8 +11,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from Configurables import CombineParticles, FilterDesktop __author__ = 'Edwige Tournefier' __date__ = '08/06/2012' __version__ = '$ 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py index 99d45c194..7ceb214bd 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '28/03/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py index 7c60c2e0a..dd539e9d6 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py @@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection from Configurables import LoKi__VoidFilter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '30/09/2010' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py index f03d28c2c..89f19ca3d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py @@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * -from copy import copy +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Xabier Cid Vidal'] # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina __date__ = '10/3/2020' @@ -178,10 +176,10 @@ class StrippingEtap2pipimumuConf(LineBuilder): LineBuilder.__init__(self, name, config) - Ds2EtapLine_name = name+"_Ds2Etap" - Bu2EtapLine_name = name+"_Bu2Etap" - Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi" - Bu2JPsiKLine_name = name+"_Bu2JPsiK" + name+"_Ds2Etap" + name+"_Bu2Etap" + name+"_Ds2Phi3Pi" + name+"_Bu2JPsiK" # 1 : Make pions and kaons selPionsEta = makeDaughters( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py index 92ada5696..5547236ca 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py @@ -12,14 +12,10 @@ Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b- Author: Yasmine Amhis ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLoosePions, StdAllLooseKaons -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Yasmine Amhis', 'updated by Vitalii Lisovskyi'] __date__ = '19/05/2011' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py index 9e29771dd..de3a1066b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py @@ -17,13 +17,10 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop -from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection +from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = ['Marian Stahl'] diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py index 9372dd979..9454a8ad6 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py @@ -18,12 +18,9 @@ Author: M. Stahl Notes: Be creative! ''' from PhysSelPython.Wrappers import Selection, AutomaticData -import math from LoKiProtoParticles.decorators import * from LoKiArrayFunctors.decorators import * from LoKiPhys.decorators import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py index fa5c47368..2596756ef 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py @@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liming Zhang', 'Xuesong Liu'] __date__ = '23/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py index 0ef3e6ee6..c9b94fd99 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py @@ -15,7 +15,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Xijun Wang' __date__ = '2021-3-18' __version__ = 'Stripping28' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py index 8a70403dd..d421f354b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py @@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf', 'makeOmegab2XicKpi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py index 6cb9b0c8a..445c8816a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py @@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0', 'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi', 'makeOmegab2Omegacgammapi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py index 19c34eb3a..976853052 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py @@ -32,7 +32,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV -from Configurables import HCRawBankDecoderHlt default_config = { 'JpsiPhotoProduction': diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py index 3438f5858..f29c13fc3 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py @@ -27,7 +27,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV -from Configurables import HCRawBankDecoderHlt default_config = { 'JpsiPhotoProductionPrescaled': diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py index cfa932415..1e28adc9f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py @@ -12,12 +12,11 @@ Module for selecting Hc -> p pbar mu mu ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Liupan An'] __date__ = '18/05/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py index ed73d91a4..ca5c93c20 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py @@ -47,16 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Configurables import TisTosParticleTagger default_name = "Xibc" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py index 5520ac91a..28b1ca4c2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py @@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py index 0fda677df..7dde23cf7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py @@ -30,9 +30,7 @@ Xicc+ -> D+ p+ K- from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, Selection __author__ = ['Jibo He'] __date__ = '20/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py index db2b4d65b..a6b52e064 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py @@ -54,12 +54,10 @@ Exported symbols (use python help!): - """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from Configurables import DaVinci__N4BodyDecays __author__ = ["Pietro Marino", "Oliver Gruenberg"] __date__ = "13.10.2017" __version__ = "$Revision: 3.0 $" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py index 056df1189..8ae9f0416 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py @@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc', 'Luca Pescatore'] __date__ = '23/01/2019' __version__ = '$Revision: 3.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py index 79abd1433..c90f7faea 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py @@ -24,16 +24,14 @@ __all__ = ('B2HHBDTLines', 'applyBDT', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py index 41030075a..e86c40013 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py @@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf', 'makeB2HHPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py index f404e2a87..2dcd40aee 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py @@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1' __all__ = {'B2KShhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py index f95cf1096..07d236ac7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py @@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf', from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # ipchi2 cut from StandardParticles import StdLooseKsDD, StdLooseKsLL -from PhysSelPython.Wrappers import Selection, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py index 94a25a271..a39998cb0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py @@ -22,7 +22,6 @@ __version__ = 'Stripping26' __all__ = {'B2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum'] _combCuts = _aptCut diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py index 0ec9c6a5d..0ba12bf37 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py @@ -23,7 +23,6 @@ __date__ = '05/02/2021' __version__ = 'Stripping29r2p2' __all__ = 'B2LambdapppLinesConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -214,8 +213,8 @@ class B2LambdapppLinesConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -270,8 +269,8 @@ class B2LambdapppLinesConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -304,7 +303,7 @@ class B2LambdapppLinesConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B0_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_DD_PTsum'] @@ -436,7 +435,7 @@ class B2LambdapppLinesConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B0_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_LD_PTsum'] @@ -452,7 +451,7 @@ class B2LambdapppLinesConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['B0_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['B0_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B0_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['B0_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py index 8911a3d3b..93fef262a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py @@ -31,11 +31,10 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseProtons from StandardParticles import StdNoPIDsPions as Pions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns +from StrippingUtils.Utils import LineBuilder +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_config = {'NAME': 'B2TwoBaryons', 'WGs': ['BnoC'], @@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder): B2PPbarName = name + "B2PPbar" - B2PPSameSignName = name + "B2PPSameSign" + name + "B2PPSameSign" B2Lp_dd_name = name+'B2PLambdabarDD' B2Lp_ll_name = name+'B2PLambdabarLL' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py index e1adec500..95fbd4216 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py @@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection -from GaudiKernel import SystemOfUnits as Units -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection __author__ = ['Timothy Williams'] __date__ = '1/12/2016' __version__ = 'Stripping26r1' @@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2'] _combCut12 = _combCut12Doca # _eta3Pi=CombineParticles("eta3Pi", @@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder): _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut _combCuts = _massCut+'&'+_docaCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2'] _combCut12 = _combCut12Doca # _etap=CombineParticles("etap", @@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut+'&'+_docaCut _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc", @@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder): _combCuts = _massCut _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2'] - _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] + "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2'] _combCut12 = _combCut12Doca _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc", diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py index 29c076674..9f701cc98 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py @@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Daniel Vieira, Jibo He'] __date__ = '01/12/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py index 08e1d2943..9fe5c82af 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py @@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Daniel Vieira'] __date__ = '29/11/2018' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py old mode 100755 new mode 100644 index 3ca4b3b86..5ffc4a205 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py @@ -25,16 +25,13 @@ __all__ = ('B2pphhConf', ) -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # from Configurables import DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'B2pphh', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py index cc0952e7e..21b92fa5a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppK_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Alvaro Gomes', 'Adlene Hicheur'] __date__ = '31/08/2014' __version__ = '$Revision: 1.5 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py index cc743704a..1f66a1746 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py @@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from Gaudi.Configuration import * __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson'] __date__ = '22/11/2016' __version__ = '3.2' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py index 629ca8140..2294a5bb7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -22,14 +22,11 @@ __date__ = '13/09/2016' __version__ = 'Run2' __all__ = {'Bs2KSKSConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdNoPIDsPions as Pions -from StandardParticles import StdNoPIDsDownPions as DownPions default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py index 1792d3977..ada24235b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py @@ -19,11 +19,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '12/11/2015' __version__ = '5.1' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py index ceb8daa24..0c1ff7d62 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py @@ -20,11 +20,8 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from CommonParticles.Utils import * -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * __author__ = ['Brais Sanmartin Sedes'] __date__ = '01/12/2015' __version__ = '5.0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py index 0f280a3a0..1124dcdfd 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py @@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members: ''' from StandardParticles import StdAllLooseANNKaons as MyLooseKaons -from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons -import StandardParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Sean Benson'] __date__ = '2013/08/15' __version__ = '3.0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py index c20e2b517..19a07b4fb 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py @@ -23,7 +23,6 @@ __date__ = '16/12/2020' __version__ = 'Stripping28' __all__ = 'Bu2KShConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -258,7 +257,7 @@ class Bu2KShConf(LineBuilder): _massCutLow = "(AM>(5279-%s)*MeV)" % config['B_Mlow'] _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _daugPtSumCut = "((APT1+APT2)>%s*MeV)" % config['BDaug_DD_PTsum'] _combCuts = _massCutLow diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py index 5a06d1502..032717bce 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py @@ -23,7 +23,6 @@ __version__ = 'Stripping26' __all__ = {'Bu2KsthhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum'] @@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder): _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['B_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum'] diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py index 890eba469..62ede4129 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py @@ -22,13 +22,11 @@ Exported symbols (use python help!): - makepph_incl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes'] __date__ = '19/05/2017' __version__ = 'Stripping29' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py index 6ff36ce63..51df1d506 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py @@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Jason E Andrews" __date__ = "26/11/2016" __version__ = "4.0" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py index be4eeb8a2..65e1b29f0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py @@ -23,13 +23,11 @@ Exported symbols (use python help!): - makeppKpipi_excl ''' -from Configurables import LoKi__VoidFilter as VoidFilter from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection import StandardParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Luiz Gustavo de Oliveira', 'Alvaro Gomes', 'Bruno Souza de Paula'] __date__ = '22/Aug/2014' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py index 6bee34511..98ef43000 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py @@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines', 'makeD2HHBDT', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py index 11da99218..3b3424d2f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py @@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines', 'makeB2Charged2Body', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons +from StandardParticles import StdNoPIDsPions from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py index 6b1c9eb94..f3104c9b5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py @@ -22,7 +22,6 @@ __date__ = '10/02/2017' __version__ = 'Stripping28' __all__ = 'Hb2V0V0hConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py index f63034e02..e896944db 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py @@ -25,7 +25,6 @@ __date__ = '11/01/2017' __version__ = 'Stripping28' __all__ = 'Lb2V0hhConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2'] _motherCuts = _ptCut @@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py index d92d1478c..c412d7f27 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py @@ -24,7 +24,6 @@ __date__ = '06/01/2019' __version__ = 'Stripping29r2p1' __all__ = 'Lb2V0ppConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine @@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder): _vtxCut = "(VFASPF(VCHI2)<%s) " % config['Lambda_DD_VtxChi2'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2'] _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin'] - _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] - _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb'] + "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb'] _allCuts = _momCut _allCuts += '&'+_massCut @@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin'] @@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum'] @@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin'] @@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder): _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh'] _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin'] _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT'] - _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] + "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP'] _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2'] _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum'] @@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder): _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2'] _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV'] - _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] + "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV'] _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2'] _motherCuts = _ptCut diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py index 44ba838d4..ef2483763 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli'] __date__ = '12/11/2015' __version__ = 'v1r0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py index d07d7e52c..2c10d1f20 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli'] __date__ = '01/04/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py index 54b56a996..7b8a9c8dd 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py @@ -27,7 +27,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Gediminas Sarpis', 'Hendrik Jage'] __date__ = '06/04/2021' __version__ = 'v1r0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py index ae62ac803..35432dcb4 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham'] __date__ = '24/11/2016' __version__ = 'v1r0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py index 2f1d600f0..6f8394542 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py @@ -21,7 +21,6 @@ __version__ = "1.0" __all__ = ("Xib2LbXLb2phLines", "default_config") -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from StandardParticles import (StdAllNoPIDsPions, @@ -30,7 +29,7 @@ from StandardParticles import (StdAllNoPIDsPions, from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py index c458c3e6c..98fad852e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py @@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen'] __date__ = '10/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py index 6c6f284aa..4afa986a8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py @@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen'] __date__ = '19/03/2013' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf', 'default_config') diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py index b8f25c655..7fd939520 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py index ac92a6c8c..c14b9b11f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py @@ -8,9 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis'] __date__ = '18/05/2017' __version__ = '$Revision: 0.01 $' @@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, # "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py index 6f502e7b9..1f1c5f4a9 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py @@ -26,9 +26,8 @@ __all__ = ('StrippingD02KPiPi0ForPidConf', 'makeD02KPiPi0R', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLoosePi02gg diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py index bd7db7dbc..b5eea4d7c 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py @@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions name = 'confD0forBXX' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py index 358d6686a..950314e23 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py @@ -40,9 +40,8 @@ __all__ = ('StrippingDst2D0PiConf', 'makeDst2D0Pi', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg, StdLoosePi02gg diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py index c047319a0..64e2e6642 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py @@ -33,15 +33,15 @@ from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons -from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0 +from StandardParticles import StdLooseAllPhotons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2hhGammaCalib', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py index 72e0b978a..56eb58e21 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py @@ -23,9 +23,8 @@ stream.appendLines( [ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jibo He', 'Vitalii Lisovskyi'] __date__ = '21/06/2021' __version__ = '$Revision: 1.2 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py index c19ff961c..bdb289200 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py @@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions from StandardParticles import StdAllLooseKaons as Hlt2Kaons from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons from StandardParticles import StdNoPIDsMuons as Hlt2Muons -from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter, - ConfiguredForwardStraightLineEventFitter) +from TrackFitter.ConfiguredFitters import ConfiguredEventFitter from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import DataOnDemand, MergedSelection from PhysConf.Selections import L0TOSSelection from PhysConf.Selections import Hlt1TOSSelection from PhysConf.Selections import Hlt2TOSSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from Gaudi.Configuration import * __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov'] __date__ = '14/1/2018' @@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, - NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, - PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator, - TrackStateInitAlg, TrackStateInitTool) +from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc, + ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy, + TrackStateInitAlg) default_config = {'NAME': 'ElectronRecoEff', 'WGs': ['Calib'], @@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self._config = config self.name = name @@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder): ) def DetachedEEKPair(self, _name): - configuration = self._config["DetachedEEK"] + self._config["DetachedEEK"] _DetachedEEKPair = self.getCPForEEK("DetachedEEK") _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name, @@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEKstarPair(self, _name): - configuration = self._config["DetachedEEKstar"] + self._config["DetachedEEKstar"] _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar") _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name, @@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder): return line def DetachedEEPhiPair(self, _name): - configuration = self._config["DetachedEEPhi"] + self._config["DetachedEEPhi"] _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi") _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name, @@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder): def MakeVeloTracks(self, prefilter): if self._config["DoVeloDecoding"]: from DAQSys.Decoders import DecoderDB - from DAQSys.DecoderClass import decodersForBank decs = [] vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"] vdec.Active = True diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py index d630ed353..be5c53aa3 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py @@ -25,12 +25,10 @@ __all__ = ('StrippingEta2MuMuGammaConf', 'makeMuMuGamma', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllLooseMuons default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py index 66d3cf569..f83a469f0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py @@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons __all__ = ('JPsiForSLAllLinesConf', 'confdict') diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py index 5e95ecb40..9ea071dc7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py @@ -14,10 +14,6 @@ one missing pion, using the corrected mass ''' from StrippingUtils.Utils import LineBuilder -from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Michel De Cian'] __date__ = '19/12/2018' __version__ = '$Revision: 1.0 $' @@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowDownstream is not None: return self._dipionSelSSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSNarrowLong is not None: return self._dipionSelSSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelSSWide is not None: return self._dipionSelSSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipi = CombineParticles( DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"], @@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowDownstream is not None: return self._dipionSelOSNarrowDownstream - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSNarrowLong is not None: return self._dipionSelOSNarrowLong - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)" @@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): if self._dipionSelOSWide is not None: return self._dipionSelOSWide - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection # Cut out the Kshort mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)" @@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionSS is not None: # return self._tripionSelDipionSS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi-]cc"], @@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder): # if self._tripionSelDipionOS is not None: # return self._tripionSelDipionOS - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import CombineParticles + from PhysSelPython.Wrappers import Selection _k2pipipi = CombineParticles( DecayDescriptors=["[K+ -> phi(1020) pi+]cc"], diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py index e464daa38..3d23ab459 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py @@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A. from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['G.Ciezarek', ] __date__ = '03/12/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py index fa526c7de..5315ade7f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py @@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params ) ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory -from Configurables import LoKi__VoidFilter as VoidFilter -from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team'] __date__ = '23/08/2011' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py index d2de08dbe..a43c58f87 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -29,7 +27,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+). __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config') -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py index 23bbe71b4..9232160ad 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py @@ -10,15 +10,12 @@ ############################################################################### from CommonParticles.Utils import trackSelector, updateDoD -from Configurables import NoPIDsParticleMaker, CombinedParticleMaker -from Gaudi.Configuration import * +from Configurables import NoPIDsParticleMaker from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsElectrons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import AutomaticData, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = 'Vitalii Lisovskyi' __date__ = '15/03/2021' __version__ = '$Revision: 0.0 $' @@ -29,7 +26,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+) for hadron->e ''' -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles @@ -649,7 +646,7 @@ def brempion_PMaker(name, Particle='pion') algorithm_pi.AddBremPhotonTo = ['pi+'] # configure the track selector - selector_pi = trackSelector(algorithm_pi) + trackSelector(algorithm_pi) # configure Data-On-Demand service updateDoD(algorithm_pi) # finally: define the symbol @@ -694,7 +691,7 @@ def bremkaon_PMaker(name, Particle='kaon') algorithm_K.AddBremPhotonTo = ['K+'] # configure the track selector - selector_K = trackSelector(algorithm_K) + trackSelector(algorithm_K) # configure Data-On-Demand service updateDoD(algorithm_K) # finally: define the symbol diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py index e82b56942..e6940ae61 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py @@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Lucio Anderlini'] __date__ = '25/02/2015' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py index c9b3c9d60..ee9bc7b3c 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py @@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions +from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py old mode 100755 new mode 100644 index 02a389d2c..ac589d4b1 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py @@ -49,35 +49,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py index 84b931c72..aae7dfa49 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py @@ -65,11 +65,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py index c7da7abed..3f821c024 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py @@ -29,25 +29,17 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec +from Configurables import VeloMuonBuilder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from Configurables import CombineParticles -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator -from Configurables import TrackEventFitter, TrackMasterFitter -from TrackFitter.ConfiguredFitters import ConfiguredFit -from PhysSelPython.Wrappers import AutomaticData -from Configurables import TrackSys from Configurables import GaudiSequencer from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger from StandardParticles import StdLooseMuons from StrippingUtils.Utils import LineBuilder -from Configurables import TrackCloneFinder from StrippingConf.StrippingLine import StrippingLine from Configurables import FastVeloTracking -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector +from PhysSelPython.Wrappers import Selection __author__ = ['Flavio Archilli'] __date__ = '30/10/2019' __version__ = '$Revision: 0.1 $' @@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder): _config = self.config[confLine] - _pchargeCut = None - _tchargeCut = None _tagCharge = None _probeCharge = None _chargename = None diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py index 316195569..25cd049b1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py @@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre ) from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from copy import copy name = 'StrippingB2ppipiSigmacmm_Lcpi' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py index e71b5b307..41168201d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py @@ -23,7 +23,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Matt Rudolph'] __date__ = '2021/3/14' __version__ = 'v1r0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py index 920c9faef..1e9ecbdf3 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py @@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingChargedHyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py index 8f420ab23..1776621bc 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py @@ -26,7 +26,7 @@ __all__ = ( 'StrippingCharm2PPXConf' # ??? ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import CombineParticles, FilterDesktop # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays from StandardParticles import ( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py index addb5112d..196b7aca8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py @@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf', 'makeDstarD02HMuNu') from Gaudi.Configuration import * -from Configurables import SubstitutePID from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py index 62cf538da..72c361785 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py @@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf', 'default_config') from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py index a291ecd27..d47b5088f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py @@ -37,16 +37,12 @@ __version__ = '$Revision: 0.1 $' __all__ = ('StrippingCharmedBaryonSL', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons +from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseProtons, StdLooseMuons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -import sys +from GaudiKernel.SystemOfUnits import GeV, MeV, mm default_name = 'CharmedBaryonSL' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py index 048a0f735..2e831b063 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py @@ -25,9 +25,8 @@ __date__ = '15/05/2014' __version__ = 'Stripping23' __all__ = 'D02KSKSConf' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder @@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] @@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] @@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] @@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder): _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB'] # 40 - _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] + "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 200 _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py index e5639b908..8b56f2ae0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHKsLines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py index 608335906..8557b0ed7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py @@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $' __all__ = ('D2HHHPi0Lines', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0 from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py index eacf772b4..efe5ef893 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun', 'Adam Davis'] __date__ = '03/19/2021' __version__ = '$Revision: 0.02 $' @@ -97,7 +95,6 @@ class D2HLepNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py index 7e19b796a..c3359cfd1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Liang Sun'] __date__ = '07/05/2019' __version__ = '$Revision: 0.01 $' @@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self._config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons + from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config) _mupid = StdAllLooseMuons if self._config["NoPIDmu"]: diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py index d58964475..e5b9f6c86 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py @@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StandardParticles import StdLoosePions, StdLooseKaons from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import TisTosParticleTagger -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_name = 'D2KS0H' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py index d9497b537..3ac31a1bc 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py @@ -33,7 +33,7 @@ __all__ = ( ) -from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond from StandardParticles import ( StdAllNoPIDsKaons, @@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine # from Configurables import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays default_config = { 'D2Pi0H': { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py index 6cb438028..f2ecc06f3 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons +from StandardParticles import StdAllLooseElectrons from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons -from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons +from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop import copy __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina'] __date__ = '25/6/2012' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py index 51c213ed2..a370c49ab 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py @@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder', ''' This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma ''' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine @@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder): stdNoPIDsPions = StdAllNoPIDsPions d2kpi_name = name+'PromptD2KPi' - d0RS_name = name+'PromptD0RS' + name+'PromptD0RS' d0WS_name = name+'PromptD0WS' d2kk_name = name+'PromptD2KK' d2pipi_name = name+'PromptD2PiPi' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py index 1ec2a5239..eb622bead 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py @@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $' __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) name = "D2hhhFTCalib" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -254,7 +251,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py index 436d8a20e..49374bf77 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py @@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import (StdNoPIDsPions, - StdTightKaons) +from StandardParticles import StdNoPIDsPions name = "D2hhh" # Cuts to be implemented vy the Stripping team in Stripping Settings @@ -717,7 +716,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py index ce2ac8d8f..e052e20ee 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py @@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default where xx = {mu mu, pi pi, pi mu, k mu, ... } ''' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py index fd5188441..9f366f1a6 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py @@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0. Supersedes StrippingDstarD2hhpi0 """ -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0 -from Configurables import TisTosParticleTagger __all__ = ('DstarD0ToHHPi0AllLinesBuilder', 'DstarMaker', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py index 79b905d65..15c8bc47e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py @@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $' __all__ = ('DstarD2HHHHLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, picosecond default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py index bef9e3302..bcfa56160 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py @@ -21,18 +21,17 @@ __version__ = '$Revision: 1.1 $' __all__ = ('DstarD2KSHHPi0Lines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py index 0446a490b..8bb88c690 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py @@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder', 'makeD2KShh', 'makeDstar') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py index e7b224211..20835582f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py @@ -32,7 +32,6 @@ __version__ = '$Revision: 0.5 $' __all__ = ('DstarD2XGammaLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons @@ -40,11 +39,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from Configurables import FilterDesktop -from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond default_config = { 'NAME': 'DstarD2XGamma', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py index 13343e403..22e9ffd46 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py @@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $' __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py index e83ad60bb..a1c41727a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py @@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $' __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll', 'makePromptDstar', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import checkConfig, LineBuilder +from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, GeV, mm from copy import copy diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py index 6b0889892..dadd6c5c2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py @@ -321,7 +321,6 @@ def globalEventCutFilter(name, if MaxTrSIZE == None: return None - from Configurables import LoKi__VoidFilter as VoidFilter from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory modules = CoreFactory('CoreFactory').Modules for i in ['LoKiTracks.decorators']: diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py index c55a09ec5..937669104 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py @@ -29,7 +29,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop # from StandardParticles import StdNoPIDsPions as InputPionsPiPi # from StandardParticles import StdNoPIDsKaons as InputKaons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py index d3888168f..2c9fd0089 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py @@ -24,11 +24,9 @@ __date__ = '13/10/2017' __all__ = ('default_config', 'StrippingHc2V03HConf') from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdAllLoosePions as InputPions from StandardParticles import StdAllLooseKaons as InputKaons -from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py index 1cc1e18bb..62f83f01a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py @@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py index 8860909e6..05d0ef190 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py @@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto from StandardParticles import StdNoPIDsDownPions as InputDownPions from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons -from StandardParticles import StdLooseLambdaLL as InputLambdasLL -from StandardParticles import StdLooseLambdaDD as InputLambdasDD from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py index cedaab208..767a1fdbf 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py @@ -12,12 +12,11 @@ Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi- ''' -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Mengzhen Wang'] __date__ = '10/10/2017' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py index 8c19d9d3a..9689bee39 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py @@ -27,7 +27,7 @@ __all__ = ( ) from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays +from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop from StandardParticles import StdNoPIDsPions as InputPions from StandardParticles import StdNoPIDsKaons as InputKaons from StandardParticles import StdLooseLambdaLL as InputLambdasLL diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py index ae08b01f2..a730881c7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py @@ -17,12 +17,10 @@ Exported selection makers: 'makeLc', 'makeSigmac', 'makeSigmacWS', """ -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Marco Pappagallo'] __date__ = '17/03/2021' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py index 0165e116e..0a027afeb 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py @@ -12,17 +12,10 @@ Module for selecting Lambda_c+->Lambda pi+ ''' -from StandardParticles import (StdAllLoosePions, StdLooseProtons, - StdLoosePions, StdNoPIDsUpPions) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons -from Configurables import LoKi__VoidFilter -from PhysSelPython.Wrappers import MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie'] __date__ = '28/11/2016' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py index 5cd5cf6bb..147241ad2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py @@ -31,13 +31,9 @@ __version__ = '$Revision: 1.1 $' __all__ = ('StrippingNeutralCBaryonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py index 91757124d..90176344c 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py @@ -11,8 +11,6 @@ """ Exclusive lines for Xc+ -> Lambda0 KS0 h+ """ -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py index 8e47ddfa3..5a28d5b8f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py @@ -13,10 +13,8 @@ Stripping lines for Xic+ -> Xi- pi+ pi+, Lc+ -> Xi- pi+ K+ and Xic+ -> Xi- pi+ K The lines are used to complement the inclusive Xi Turbo lines by adding Velo raw banks to study if the Xi- can be reconstructed as an upstream track. """ -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import FilterDesktop from PhysConf.Selections import ( - FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection) + FilterSelection, CombineSelection, Combine3BodySelection) from PhysSelPython.Wrappers import AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py index e34807cd1..32300611a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py @@ -8,18 +8,15 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons from StrippingUtils.Utils import LineBuilder -from PhysSelPython.Wrappers import MultiSelectionSequence -from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from Configurables import FilterDesktop, CombineParticles from LHCbKernel.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, mm, ns +from GaudiKernel.SystemOfUnits import MeV, mm from StrippingConf.StrippingLine import StrippingLine from Gaudi.Configuration import * -import re all ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles ''' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py index 71b78eea7..d6856b0e1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py @@ -15,7 +15,7 @@ Exclusive lines for Xic+ -> Sigma0 KS0 pi+, Xic0 -> Sigma0 K- pi+ and Xic+ -> Si from CommonParticles.Utils import updateDoD from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from Configurables import (FilterDesktop, ResolvedPi0Maker, PhotonMaker) +from Configurables import (ResolvedPi0Maker, PhotonMaker) from PhysConf.Selections import (FilterSelection, Combine3BodySelection, MergedSelection, SimpleSelection) from PhysSelPython.Wrappers import AutomaticData diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py index 2468c2d79..45478d9be 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py @@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons -from StandardParticles import StdLoosePions -from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD from GaudiKernel.SystemOfUnits import MeV, GeV, mm from Configurables import TisTosParticleTagger diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py index f5880e4d7..d77d3c930 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py @@ -38,17 +38,12 @@ __version__ = '$Revision: 0.3 $' __all__ = ('StrippingXiccSL', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from Configurables import TisTosParticleTagger -import sys default_name = 'XiccSL' @@ -400,7 +395,7 @@ class StrippingXiccSL(LineBuilder): _strCutMoth_Zero = "(CHILD(VFASPF(VZ),1) - VFASPF(VZ) > %(Omegacc_Lc_delta_VZ_Min)s)" \ "& (BPVDIRA > %(Omegacc_Zero_BPVDIRA_Min)s)" % self.config - _strCutMoth2 = _strChi2Moth2 + '&' + _strCutMoth + _strChi2Moth2 + '&' + _strCutMoth _strCutMoth2_Zero = _strChi2Moth2 + '&' + _strCutMoth_Zero ''' Stripping Omega_cc+ -> Omega_c0 mu+ ''' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py index 8e3831dcc..8a3816804 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py @@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from Gaudi.Configuration import * __author__ = ['Hendrik Jage', 'Gediminas Sarpis'] __date__ = '19/03/2021' __version__ = 'v1r0' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py index 46870fe2f..940b716b2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py @@ -19,15 +19,12 @@ __version__ = 'v0r1' __all__ = ('HeMedianConf', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsProtons as Protons -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'HeMedian', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py index 6e86f2745..2b79ea417 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py @@ -19,15 +19,12 @@ __version__ = 'v0r1' __all__ = ('HeNOverflowsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from StandardParticles import StdAllNoPIDsProtons as Protons -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'HeNOverflows', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py index 3e380b934..8ffdf55b2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py @@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf', 'makeD02KPiPi0M', 'default_config') -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0 diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py index 7006c283f..b23478e8f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py index 4282eb3c7..c3ba0aa8f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py @@ -13,10 +13,8 @@ from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from LHCbKernel.Configuration import * -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles __author__ = ['Philip Xing', 'Andrew Powell'] __date__ = '23rd August 2012' __version__ = '$Revision: 7.0 $' @@ -36,7 +34,7 @@ Usage: __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar") -from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV +from GaudiKernel.SystemOfUnits import GeV, MeV # from Configurables import FilterDesktop, CombineParticles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py index d76254846..d4ecc7b6f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py @@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py index df8b9c18c..9b8d406ef 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py @@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Yanxi ZHANG'] __date__ = '25/02/2015' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py index 19f3d03c9..8308d72b5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py @@ -12,13 +12,9 @@ Module for selecting specific topology ''' -from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons +from Configurables import FilterDesktop from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand -from Gaudi.Configuration import * __author__ = ['Emilie MAURICE'] __date__ = '' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py index 4b221c471..bd21417c5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py @@ -43,34 +43,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf', # FIXME Write includes in a cleaner way from Gaudi.Configuration import * from LHCbKernel.Configuration import * -from DAQSys.DecoderClass import Decoder from Configurables import GaudiSequencer from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker -from TrackFitter.ConfiguredFitters import ConfiguredFit from Configurables import TrackStateInitAlg from StrippingConf.StrippingLine import StrippingLine -from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite +from Configurables import ChargedProtoParticleAddMuonInfo from MuonID import ConfiguredMuonIDs from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter -from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from PhysSelPython.Wrappers import Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter -from os import environ from Gaudi.Configuration import * -import GaudiKernel.ProcessJobOptions -from GaudiKernel.SystemOfUnits import mm from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger from StandardParticles import StdAllLooseMuons from Configurables import GaudiSequencer from Configurables import TrackToDST -from Configurables import TrackSys from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream +from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream from PatAlgorithms import PatAlgConf from SelPy.utils import (UniquelyNamedObject, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py index d45ec02ac..e2e32a543 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py @@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf', 'makeBJpsiKTrackEff', 'filterHLT2ForBJpsiK') -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection +from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection from StrippingConf.StrippingLine import StrippingLine from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StrippingUtils.Utils import LineBuilder, checkConfig -from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons +from StrippingUtils.Utils import LineBuilder +from StandardParticles import StdAllLooseMuons, StdLooseKaons from Configurables import (MuonCombRec, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py index c0bb11bf8..38f843265 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py @@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf', ) -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles -from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand -from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker +from PhysSelPython.Wrappers import Selection +from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector from Configurables import FastVeloTracking from StrippingConf.StrippingLine import StrippingLine -from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec -from Configurables import TrackCloneFinder +from Configurables import StandaloneMuonRec, TrackPrepareVelo from StrippingUtils.Utils import LineBuilder # changed from StdLooseMuons, yanxi from StandardParticles import StdAllLooseMuons @@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT # from Configurables import TisTosParticleTagger from Configurables import GaudiSequencer -from Configurables import TrackSys -from PhysSelPython.Wrappers import AutomaticData # Get the fitters -from TrackFitter.ConfiguredFitters import ConfiguredFit -from Configurables import TrackEventCloneKiller, VeloMuonBuilder -from Configurables import TrackEventFitter, TrackMasterFitter -from Configurables import TrackKalmanFilter, TrackMasterExtrapolator +from Configurables import VeloMuonBuilder # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter # from Configurables import TrackCloneFinder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py index 3ee7aeb4f..e7e59c7c8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py @@ -24,7 +24,6 @@ __date__ = '19/03/2021' __version__ = 'v1r0' __all__ = {'Lb2V0pphhConf', 'default_config'} -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py index c5a28128f..ad0fc42d4 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py @@ -24,7 +24,6 @@ __all__ = ('Lb2dpXConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from StandardParticles import StdAllNoPIDsPions as Pions @@ -33,7 +32,6 @@ from StandardParticles import StdAllNoPIDsKaons as Kaons from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dpX', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py index 4d837a2f7..460036843 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Andrea Contu' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py index 7ba890fe4..f791c6cd1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine __author__ = 'Patrick Koppenburg' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py index f9e3c9136..bcd975246 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py @@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper") -from GaudiConfUtils import isConfigurable from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences, - IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation) + IncompatibleInputLocations, makeOutputLocation, setOutputLocation) -from PhysSelPython.Wrappers import checkConfigurable, checkName +from PhysSelPython.Wrappers import checkName def connectToRequiredSelections(selection, inputSetter): diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py old mode 100755 new mode 100644 index 91e62b0b6..281aebf4b --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py @@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He. """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py index 64c106858..cd47529d1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py index 5911c40e3..a89a6a8b5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py @@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons +from StandardParticles import StdAllLooseMuons from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py index a5398df14..db69855d7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py @@ -9,12 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from CommonParticles import StdAllNoPIDsPions from StrippingUtils.Utils import LineBuilder ''' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py index 0a74c48c6..a3e372506 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py @@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $' __all__ = ('B2EHNLLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons +from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py index 073c098c3..179fe2f52 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py @@ -18,13 +18,11 @@ __date__ = '25/01/2019' __all__ = ('B2LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'B2LLPV0', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py index 1b9907eed..ababbe64f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py @@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $' __all__ = ('B2MuHNLLines', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons +from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py index 75d6970b1..6a24e6a63 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py @@ -23,7 +23,7 @@ __all__ = ( from Gaudi.Configuration import * from CommonParticles.Utils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, @@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker, LoKi__VertexFitter, ) from PhysSelPython.Wrappers import (Selection, - SimpleSelection, - MergedSelection, - AutomaticData) + MergedSelection) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py index 9c7c8a770..6a28183b9 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py @@ -26,9 +26,8 @@ __author__ = ['J. Anderson'] __all__ = 'DY2MuMuConf', 'default_config' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py index e1e5fb0be..25b226c2d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py @@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward'] __all__ = ('DY2eeConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsElectrons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py index 5b0be7ca6..ce06625ea 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py @@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config') from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import DEBUG, VERBOSE import logging logger = logging.getLogger(__name__) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py old mode 100755 new mode 100644 index fa049324f..3e2dd3df5 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py @@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten """ -import os -from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine @@ -894,7 +893,7 @@ def Tuples(): """ import re - from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple + from DecayTreeTuple.Configuration import DecayTreeTuple seq = GaudiSequencer('TupleSeq') seq.ModeOR = True diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py old mode 100755 new mode 100644 index 53d4e78db..8fde59168 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py @@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, SimpleSelection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py index 9f9b7b90a..cf5af4522 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets -from CommonParticles.Utils import * -from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py index 0867cc3c3..8070b81f1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py @@ -10,11 +10,10 @@ ############################################################################### from Configurables import FilterDesktop, JetVertexAlg from CommonParticles.Utils import * -from LoKiPhys.functions import SOURCE, SIZE from GaudiKernel.SystemOfUnits import GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand +from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection from StandardParticles import StdJets from Gaudi.Configuration import * __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk'] diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py old mode 100755 new mode 100644 index 88da9dcd8..fef9c145f --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py @@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py index 00c3a16a5..f3d787247 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py @@ -18,13 +18,11 @@ __date__ = '23/06/2021' __all__ = ('LLPV0_sConf', 'default_config') -from Gaudi.Configuration import * from StandardParticles import StdAllNoPIDsPions from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import GeV, picosecond -from LoKiPhys.functions import SOURCE, SIZE default_config = { 'NAME': 'LLPV0', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py index 4db1eeb4f..3aec384d4 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py @@ -14,10 +14,9 @@ Stripping lines selecting scalar long-lived particles decaying to hadrons """ -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py index 8619ba15a..9c25c3202 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py @@ -18,7 +18,6 @@ __date__ = '25/01/2019' __all__ = ('LLP2Jets_sConf', 'default_config') -from Gaudi.Configuration import * from Configurables import JetVertexAlg from StandardParticles import StdJets from CommonParticles.Utils import updateDoD diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py index 5e11c78ec..6aa23424c 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py @@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import AutomaticData, Selection from GaudiKernel import SystemOfUnits as units -from LHCbKernel.Configuration import * __author__ = "Pieter David" __date__ = "2014-08-28" __all__ = ("LLP2MuXConf", "default_config") diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py index bc00d02ab..a5598540a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py @@ -13,18 +13,14 @@ Lines for searches on DM candidates produced from Lambda decays (arXiv:2101.02706). """ -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * -from CommonParticles.Utils import * -from CommonParticles import StdAllNoPIDsPions from StandardParticles import StdAllLooseKaons, StdAllLooseProtons, StdAllLoosePions from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import MeV, picosecond, millimeter +from GaudiKernel.SystemOfUnits import MeV, millimeter __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Saul Lopez Solino'] __date__ = '18/03/2021' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py old mode 100755 new mode 100644 index cf2bf7494..cbd7593f5 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py @@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf', ) -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from Configurables import LoKi__VoidFilter as VoidFilter default_config = { 'NAME': 'Lb2dp', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py index bad4ad035..6334bd68b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py @@ -10,13 +10,12 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * -from Configurables import FilterJet, ClearDaughters +from Configurables import ClearDaughters from GaudiKernel.SystemOfUnits import GeV __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py index 2624678f1..36fb89fcb 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py @@ -26,7 +26,7 @@ __author__ = ( ) from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, SimpleSelection +from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py index 578635fa7..9c45d8c73 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py @@ -21,10 +21,8 @@ Long tracks only from GaudiKernel.SystemOfUnits import MeV, GeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin MACIUC'] __date__ = '24/08/2013' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py index f3dd8ebde..2405f0e9c 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py @@ -18,14 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL DDL DDD ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from CommonParticles import StdLooseLambda -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung'] __date__ = '26/06/2012' __version__ = '$Revision: 0.3 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py index 668986b83..208ab8bad 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py @@ -18,12 +18,10 @@ Xi -> Lambda pi, Omega -> Lambda K LLL ''' -from GaudiKernel.SystemOfUnits import MeV from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Florin Maciuc'] __date__ = '13/01/2014' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py old mode 100755 new mode 100644 index 295b8a41d..bb3326270 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py @@ -10,11 +10,10 @@ ############################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter +from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdJets from CommonParticles.Utils import * from Configurables import FilterJet from GaudiKernel.SystemOfUnits import GeV diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py index cc373f666..22eacc1d7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py old mode 100755 new mode 100644 index ae80ec7c3..48a0b2de2 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py @@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Configurables import CombineParticles, LoKi__VertexFitter from PhysSelPython.Wrappers import Selection, SimpleSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets -from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import GeV, MeV diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py index de1eaf98e..f599f5433 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py @@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, picosecond __author__ = ['Hang Yin', 'Qundong Han'] __date__ = '11/29/2016' __version__ = '$Revision: 2.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py index 0820e8b43..3e509fb26 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py @@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT __all__ = 'WeConf', 'default_config' __author__ = 'S. Bifani', 'D. Ward' -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import SimpleSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py index e79701199..f6977308a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py @@ -23,7 +23,6 @@ __all__ = ( 'default_config', ) -from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import GeV, MeV from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import SimpleSelection diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py index 2f8d8eb61..35de5f4d7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py @@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllNoPIDsPions from GaudiKernel.SystemOfUnits import GeV -from GaudiKernel.SystemOfUnits import MeV default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py index 57c2091f2..e181b2853 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py @@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $' __all__ = 'default_config', 'Z0RareDecayConf' -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py index f0793d341..975321a6b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py @@ -15,8 +15,7 @@ __all__ = ('DijetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py index 73ca61d9e..6078cdec3 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py @@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf') # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from PhysSelPython.Wrappers import EventSelection diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py index 02e5fc430..55abf24d9 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py @@ -15,13 +15,11 @@ __all__ = ('JetsConf', 'default_config') -from Gaudi.Configuration import * -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from GaudiKernel.SystemOfUnits import GeV, MeV +from PhysSelPython.Wrappers import MergedSelection, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from JetAccessories.JetMaker_Config import JetMakerConf from StandardParticles import StdJets, StdAllNoPIDsPions from Configurables import CombineParticles from Configurables import TopologicalTagging diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py index ce5265655..666cef80a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py @@ -10,11 +10,6 @@ ############################################################################### # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from PhysSelPython.Wrappers import Selection, MergedSelection -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\# diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py index 3d6992fd3..93bd54fbf 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py @@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Nikita Beliy', 'Jibo He'] __date__ = '28/11/2016' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py index a6e53abda..15ea2076d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py @@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf", ############################################################################# -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py index 3244d01c6..7c9eae26a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi; based on Bu2LLK lines' __date__ = '04/09/2019' __version__ = '$Revision: 1 $' @@ -112,7 +111,6 @@ class B2DibaryonMuMuConf(LineBuilder): # 2 : Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py index b614d11a7..6a856fa99 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py @@ -12,13 +12,12 @@ B->etamumuselection ''' -from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons +from StandardParticles import StdAllNoPIDsMuons from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection +from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc'] __date__ = '04/09/2019' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py index a9d2ffd4e..61a740d6b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py @@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config') Stripping selection for inclusively selected B->KmumuX decays. """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles CombineDiMuon = CombineParticles() CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"] - sel_name = "InclKLL" CombineDiMuon.MotherCut = self.InclKLLCut # choose leptons = self.InclLeptons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py index 60fc5ccbd..b1a382095 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'Vitalii Lisovskyi' __date__ = '18/06/2021' __version__ = '$Revision: 1 $' @@ -72,7 +71,6 @@ class B2KSKSMuMuConf(LineBuilder): # Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)&(PROBNNmu>0.01)))" SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py index 4bfb173d1..df476bc07 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py @@ -16,8 +16,7 @@ from StandardParticles import StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' G. Mancinelli, J. Serrano, F. Polci, T. Fulghesu'] __date__ = '15/08/2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py index 33ad8193f..b45675d89 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He'] __date__ = '20/11/2015' __version__ = '$Revision: 1.0 $' @@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py index 6547c8d92..9a503cdbd 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py @@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = ['Jibo He', 'Yanting Fan', 'Angel Campoverde'] __date__ = '17/06/2021' __version__ = '$Revision: 1.0 $' @@ -228,7 +226,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Di letpons """ - from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllLooseANNElectrons, StdLooseDiMuonSameSign, StdAllLooseMuons + from StandardParticles import StdAllLooseANNElectrons, StdAllLooseMuons, StdLooseDiMuonSameSign self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron", DecayDescriptor="[J/psi(1S) -> e+ e+]cc", @@ -296,7 +294,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Kshort, both LL and DD """ - from StandardParticles import StdLooseKsDD, StdLooseKsLL + from StandardParticles import StdLooseKsDD self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD", InputList=StdLooseKsDD, @@ -332,7 +330,7 @@ class B2LLXBDTSSConf(LineBuilder): """ Lambda, both LL and DD """ - from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL + from StandardParticles import StdLooseLambdaDD self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD", InputList=StdLooseLambdaDD, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py index 56119a8de..28e6f3608 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py @@ -19,9 +19,7 @@ Note: from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import Selection __author__ = ['Jibo He', 'Yanting Fan'] __date__ = '10/03/2021' __version__ = '$Revision: 1.0 $' @@ -194,7 +192,7 @@ class B2LLXBDT_CalibConf(LineBuilder): """ Di letpons """ - from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllNoPIDsElectrons, StdAllNoPIDsMuons + from StandardParticles import StdAllNoPIDsElectrons, StdAllNoPIDsMuons self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron", DecayDescriptor='J/psi(1S) -> e+ e-', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py index dcb376b63..beaae1e2b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines', 'default_config') from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py index e758feafb..8c8ebee90 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py index 389b9bf69..4186a8554 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py index b829fcd48..f47c81735 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py @@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines', 'default_config') from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions -from Configurables import TisTosParticleTagger from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py index fa05d51ee..290a038e1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py @@ -21,7 +21,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from Gaudi.Configuration import * __author__ = ['Diego Martinez Santos', 'Johannes Albrecht', 'Konstantinos A. Petridis', 'Alexander Baranov'] diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py index 85a7ae0f5..be3956da7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py @@ -9,14 +9,10 @@ # or submit itself to any jurisdiction. # ############################################################################### from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # as FilterDesktop_GC -from GaudiKernel.SystemOfUnits import MeV -from CommonParticles.Utils import updateDoD from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from Configurables import (ResolvedPi0Maker, PhotonMaker) +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '05/03/2021' __version__ = '$Revision: 0 $' @@ -76,9 +72,7 @@ class B2OCMuMuConf(LineBuilder): BcLine_name = name+"Bc" BcNoPointLine_name = name+"BcNoPoint" - from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseProtons as Protons from StandardParticles import StdAllNoPIDsPions as AllPions from StandardParticles import StdAllNoPIDsKaons as AllKaons from StandardParticles import StdAllNoPIDsProtons as AllProtons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py old mode 100755 new mode 100644 index 893c8f7d2..54c9d8dbd --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi' __date__ = '04/11/2015' __version__ = '$Revision: 0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py index 018806639..e0f7a0afc 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py @@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $' __all__ = ('B2XMuMuConf', 'default_config') -from Gaudi.Configuration import * from LHCbKernel.Configuration import * # check if needed diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py index 1273eebf7..822bfb329 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py @@ -22,8 +22,6 @@ __version__ = '$Revision: 0.0 $' __all__ = ('B2XMuTauMuonicConf', 'default_config') -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py index 89967ffc1..905044339 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py @@ -8,16 +8,13 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions -from copy import deepcopy from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions, StdTightMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = ['G. Dujany, G. Mancinelli, J. Serrano'] __date__ = '24/05/2010,15/01/2014, 19/10/2017' __version__ = '$Revision: 1.3 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py index 1539daf38..c8e1fba1e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py index 44cd40b22..f25de253e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py @@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop __author__ = [' L. Pescatore', 'F. Blanc'] __date__ = '12/03/2019' __version__ = '$Revision: 0.1$' @@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$' # Stripping line for B->Htautau from GaudiKernel.SystemOfUnits import MeV -from GaudiKernel.SystemOfUnits import mm """ B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau """ diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py index 8ce4944cc..78d80371d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py @@ -23,8 +23,6 @@ __version__ = '$Revision: 0.1 $' __all__ = ('B2XTauTauMuonicConf', 'default_config') -from Gaudi.Configuration import * -from LHCbKernel.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py index 8bf68933c..a5196ce34 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py @@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf", ################################################################################################### -from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py index a346ce2d2..85c93efc5 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py @@ -32,14 +32,12 @@ __version__ = '$Revision: 0.0 $' __all__ = ('BaryonicLFVConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combine5Particles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'BaryonicLFV', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py index 419b0f750..54c987ef8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays -from Gaudi.Configuration import * +from PhysSelPython.Wrappers import MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = 'SB' __date__ = '08/10/2017' __version__ = '$Revision: 1 $' @@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder): mmXLine_name = name + "_mm" eeXLine_name = name + "_ee" - from StandardParticles import StdLoosePions as Pions - from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseKstar2Kpi as Kstars - from StandardParticles import StdLoosePhi2KK as Phis from StandardParticles import StdLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD - from StandardParticles import StdLooseLambdaLL as LambdasLL - from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdastar2pK as Lambdastars SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name, sel=KshortsLL, @@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder): sel=KshortsDD, params=config) - from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks from StandardParticles import StdLooseDiElectron as DiElectrons from StandardParticles import StdLooseDiMuon as DiMuons - ElecID = "(PIDe > %(PIDe)s)" % config - MuonID = "(HASMUON)&(ISMUON)" + "(PIDe > %(PIDe)s)" % config DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py index 1a6b35471..6776dcdf2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py @@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Marie-Helene Schune', 'Jibo He'] __date__ = '20/01/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py index 1c734bb1d..61c847ace 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.2' __all__ = ('Beauty2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdAllNoPIDsMuons as Muons from StandardParticles import StdAllNoPIDsPions as Pions @@ -424,7 +422,7 @@ class Beauty2MajoLepConf(LineBuilder): def makeMu(self, name, config): # define all the cuts _bachPtCut = "(PT>%s*MeV)" % config['Lep_PTmin'] - _bachIPChi2Cut = "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min'] + "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min'] _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _pidMuon = '(ISMUON)' @@ -860,7 +858,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] - _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow'] + "(AM>(%s*MeV))" % config['Majo_AMlow'] _combCuts = _massCutHigh + '&'+_docaCut @@ -893,7 +891,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] - _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow'] + "(AM>(%s*MeV))" % config['Majo_AMlow'] _combCuts = _massCutHigh + '&'+_docaCut _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] @@ -1111,7 +1109,7 @@ class Beauty2MajoLepConf(LineBuilder): _massCutLow = "(AM>(%s*MeV))" % config['AM_Mlow'] _massCutHigh = "(AM<(%s*MeV))" % config['AM_Mhigh'] - _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] + "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] _combCuts = _massCutLow+'&'+_massCutHigh diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py index d21b9a25b..05e9c9cf0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py @@ -12,7 +12,7 @@ B-> X Gamma selections ''' -from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons +from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0 from Configurables import TisTosParticleTagger from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py index 0cfb5425d..f1f37c460 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py @@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand """ ######################################################################## -from StrippingUtils.Utils import LineBuilder, checkConfig +from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Combine3BodySelection from StandardParticles import StdLooseMuons, StdLooseAllPhotons diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py index 28fab868c..8bf0a80a0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py @@ -26,7 +26,7 @@ from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles +from Configurables import CombineParticles from JetAccessories.JetMaker_Config import JetMakerConf from CommonParticles.Utils import * from Gaudi.Configuration import * @@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) myconf2 = JetMakerConf(stdjets_name_addb, Inputs=['Phys/PFParticles/Particles', line_location], @@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb): strob.StdJetsNoJetIDAddB = [myconf2] # configure Data-On-Demand service - locations = updateDoD(myconf2) + updateDoD(myconf2) ########################################## diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py index c9930debc..6a5687b69 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py @@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members: - Bs2gammagamma_NoConvWideLine : wide line with 0 conversions ''' -from Configurables import (DiElectronMaker, ProtoParticleCALOFilter, - ParticleTransporter, BremAdder) from GaudiConfUtils.ConfigurableGenerators import FilterDesktop # , CombineParticles -from CommonParticles import StdLooseAllPhotons -from CommonParticles import StdAllLooseGammaConversion from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from Configurables import CombineParticles -from Gaudi.Configuration import * __author__ = ['Sean Benson'] __date__ = '2016/04/08' __version__ = '1.2' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py index 86d2fbe03..22e9c5c99 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py @@ -22,9 +22,8 @@ Stripping lines: from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Jianchun Wang'] __date__ = '03/22/2015' __version__ = '$Revision: 0.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py index 138975959..80bf86657 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py @@ -10,7 +10,7 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N5BodyDecays from Gaudi.Configuration import * __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi, Biplab Dey' @@ -1733,7 +1733,6 @@ class Bu2LLKConf(LineBuilder): from StandardParticles import StdLooseMuons as Muons # from CommonParticles import StdLooseDetachedTau # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles") - from CommonParticles import StdTightDetachedTau Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles") _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc" @@ -2080,7 +2079,6 @@ class Bu2LLKConf(LineBuilder): ################################################################################################################################# def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"): - from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence from Configurables import (CopyParticles, ParticleCloner, ProtoParticleCloner, CaloHypoCloner, CaloClusterCloner) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py index 5a96cdedd..850c2f87c 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py @@ -19,12 +19,10 @@ __version__ = 'V0.9' __all__ = ('Bu2MajoLepConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.SystemOfUnits import * from StandardParticles import StdLooseMuons as Muons from StandardParticles import StdLoosePions as Pions diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py index 19ce21e90..4163901dd 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py @@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf', 'default_config') from Gaudi.Configuration import * -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdTightMuons, StdTightANNMuons from CommonParticles.Utils import * -from Configurables import FilterDesktop, CombineParticles +from Configurables import FilterDesktop from JetAccessories.JetMaker_Config import JetMakerConf default_name = 'Bu2MuNu' @@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban): strobj.StdJetsNoJetIDBan = [myconf1] # configure Data-On-Demand service - locations = updateDoD(myconf1) + updateDoD(myconf1) relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", @@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder): JetIDCut=False).algorithms[0] # configure Data-On-Demand service - locations = updateDoD(StdJetsNoJetIDNoBan) + updateDoD(StdJetsNoJetIDNoBan) # add the jets with the specific banning create_stdjets(self, self.ControlLine.outputLocation(), diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py index 9d9153bde..a119c6aad 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py @@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf", ############################################################################# from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from Configurables import DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder # from StrippingSelections.Utils import checkConfig -from GaudiKernel.PhysicalConstants import c_light ############################################################################# diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py index 754d0f380..e79bed1bf 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py @@ -17,23 +17,18 @@ Author: M. Williams, D. Craik from Configurables import DiElectronMaker, ProtoParticleCALOFilter from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays from CommonParticles.Utils import * -from copy import deepcopy from Configurables import SubstitutePID from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \ StdAllLooseElectrons, StdLooseAllPhotons # , StdDiElectronFromTracks from Beauty2Charm_LoKiCuts import LoKiCuts from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \ - StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \ - StdLooseDownMuons -from Configurables import LoKi__VoidFilter + StdAllLooseMuons, StdLooseDownMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import EventSelection from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * -import re __author__ = ['Mike Williams', 'Dan Craik'] moduleName = 'DarkBoson' @@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder): mmDDX = makeX( 'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX]) kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX]) - kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) + makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX]) pipiX = makeX( 'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX]) pipiDDX = makeX( @@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder): 'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX]) preSS = default_config['Prescales']['SS'] - preDD = default_config['Prescales']['DD'] + default_config['Prescales']['DD'] preKK = default_config['Prescales']['KK'] j = makeJ(default_config['J'], [muJ]) @@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder): kst = filterKst() self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst], default_config['B2KX']) - rho = makeRho([piB]) + makeRho([piB]) # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX], # default_config['B2HHX']) # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX], diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py index f7e5ccc22..3116bd40e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py @@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles, DaVinci__N3BodyDecays) from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from Gaudi.Configuration import * __author__ = 'M. Kreps, T. Blake, D. Loh' __date__ = '10/11/2016' __version__ = '$Revision: 1.0$' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py index 83e2745fd..e33667deb 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py @@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf', 'default_config', ) from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger -from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand +from Configurables import CombineParticles, FilterDesktop +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLooseAllPhotons @@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py index 454c44356..dc8a94331 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py @@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions, StdAllLooseMuons from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond -from Gaudi.Configuration import * +from GaudiKernel.SystemOfUnits import MeV, mm, picosecond __author__ = ['Miguel Ramos Pernas'] __date__ = '10/10/2017' __version__ = '$Revision: 0.00 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py index 83456277a..d92e0c670 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py @@ -11,7 +11,6 @@ from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase) -from itertools import product from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DelegatingTrackSelector, CombineParticles, LoKi__VertexFitter from CommonParticles.Utils import * from StandardParticles import StdNoPIDsUpElectrons @@ -23,11 +22,9 @@ from StandardParticles import StdNoPIDsDownPions from StandardParticles import StdAllNoPIDsPions from StandardParticles import StdLooseDownMuons from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllNoPIDsMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from Gaudi.Configuration import * __author__ = ['Adrian Casais Vidal', 'Carla Marin', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py index 86a943e5a..81ef82f20 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py @@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py ''' from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdLooseDownMuons +from StandardParticles import StdAllLooseMuons from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '07 January 2014' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py index 0955f65fa..07b134c73 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py @@ -10,15 +10,12 @@ ############################################################################### from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays -from GaudiKernel.SystemOfUnits import MeV from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons -from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions -from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions +from StandardParticles import StdAllLooseMuons, StdAllLoosePions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop __author__ = ['Mike Sokoloff'] __date__ = '25/10/2012' __version__ = '$Revision: 0.1 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py index 45b59c0fd..832334778 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py @@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop -from Gaudi.Configuration import * __author__ = ['Carla Marin'] __date__ = '23/11/2016' __version__ = '$1.1 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py index 4a7726e9b..279eff2f3 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py @@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf', 'default_config', ) -from Gaudi.Configuration import * # from Configurables import FilterDesktop, CombineParticles -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV, mm from copy import deepcopy # # Configure related info tools @@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder): hemu_name = name+'B2heMu' pmu_name = name+'B2hMu' bu_name = name+'Bu2KJPsiee' - taumu_name = name+'B2TauMu' + name+'B2TauMu' htaumu_name = name+'B2hTauMu' muetap_gamma_name = name+'Tau2MuEtaP2pipig' muetap_pi_name = name+'Tau2MuEtaP2pipipi' @@ -1778,7 +1776,6 @@ def makeB2TauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 25) " - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") @@ -2418,7 +2415,6 @@ def makeB2hTauMu(name): "& (BPVVDCHI2> 225)"\ "& (BPVIPCHI2()< 16) " # maybe 16 - from CommonParticles import StdLooseDetachedTau, StdLooseDipion _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles") _stdLooseDetachedTaus = DataOnDemand( Location="Phys/StdLooseDetachedTau3pi/Particles") diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py index 802119884..345937d03 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py @@ -25,9 +25,7 @@ __date__ = "14.11.2016" __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") -import os -from Gaudi.Configuration import * from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop @@ -36,9 +34,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL -from StandardParticles import StdVeryLooseDetachedKst2Kpi from StandardParticles import StdLooseJpsi2MuMu default_config = {'NAME': 'Lb2L0Gamma', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py index b2244bd7a..3d97e939f 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py @@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf", ################################################################################################### from Gaudi.Configuration import * -from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays +from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light ################################################################################################### diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py index afbfe24d3..c83aa90e0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py @@ -12,8 +12,8 @@ from CommonParticles.Utils import * from GaudiKernel.SystemOfUnits import * from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, DaVinci__N5BodyDecays, DaVinci__N6BodyDecays +from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, FilterDesktop from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '05/03/2021' @@ -100,14 +100,11 @@ class MultiLeptonConf(LineBuilder): Jpsi2Mu3EDetLine_name = name+'_Jpsi2Mu3EDetached' Jpsi2Mu3EPromptLine_name = name+'_Jpsi2Mu3EPrompt' - from StandardParticles import StdLoosePions as Pions from StandardParticles import StdLooseKaons as Kaons - from StandardParticles import StdLooseProtons as Protons from StandardParticles import StdVeryLooseKsLL as KshortsLL from StandardParticles import StdLooseKsDD as KshortsDD from StandardParticles import StdVeryLooseLambdaLL as LambdasLL from StandardParticles import StdLooseLambdaDD as LambdasDD - from StandardParticles import StdLooseLambdaLD as LambdasLD from StandardParticles import StdLoosePhi2KK as Phi2KK from StandardParticles import StdLooseKstar2Kpi as KstartoKpi from StandardParticles import StdLooseLambdastar2pK as Lstar diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py index ff157859d..1a62ef5db 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py @@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdAllLooseKaons, StdAllLooseMuons -from Configurables import FitDecayTrees -from PhysSelPython.Wrappers import AutomaticData, MergedSelection +from PhysSelPython.Wrappers import MergedSelection __all__ = ('PhiToKSKSAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py index e3c0eaddc..51ba747a0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py @@ -12,11 +12,10 @@ from GaudiKernel.SystemOfUnits import MeV from CommonParticles.Utils import updateDoD from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection from Configurables import (ResolvedPi0Maker, PhotonMaker) from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays from GaudiConfUtils.ConfigurableGenerators import FilterDesktop as FilterDesktop_GC -from Gaudi.Configuration import * __author__ = 'Vitalii Lisovskyi' __date__ = '26/02/2021' __version__ = '$Revision: 0 $' @@ -343,7 +342,6 @@ class RareBaryonicMuMuConf(LineBuilder): # 2 : Make Dileptons from StandardParticles import StdLooseDiMuon as DiMuons - MuonID = "(HASMUON)&(ISMUON)" DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))" DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe>0)))" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py index a24627bc3..ff85ddd92 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py @@ -10,9 +10,8 @@ ############################################################################### from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro' __date__ = '08/05/2015' __version__ = '$Revision: Not sure $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py index 6f7264e1d..bba73d994 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py @@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf', from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light -from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions, - StdLoosePions, StdLooseDownMuons, - StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0) +from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0, + StdLooseDalitzPi0) # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e) @@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs): def makevelotracks(name): - from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg, TrackContainerCopy + from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg from TrackFitter.ConfiguredFitters import ConfiguredEventFitter MyFastVeloTracking = FastVeloTracking( diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py index 4b77564a2..cc3f28a66 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py @@ -18,13 +18,9 @@ __version__ = '$Revision: 1.0 $' __all__ = ('StrippingS2HyperonsConf', 'default_config') -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons -from StandardParticles import StdAllLoosePions, StdAllLooseKaons from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from PhysSelPython.Wrappers import MultiSelectionSequence from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from GaudiKernel.SystemOfUnits import MeV, mm, picosecond diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py index 1a58f8ff0..c9a1d99c7 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py @@ -12,9 +12,8 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine -from PhysSelPython.Wrappers import Selection, MergedSelection, AutomaticData +from PhysSelPython.Wrappers import MergedSelection, Selection from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = "Dan Thompson; based on combination of Bu2LLK lines and Bs2st2KKMuXLine" __date__ = "14/06/2021" __version__ = "$Revision: 1$" diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py index 5c16fb7fd..e6fb5c31d 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py @@ -35,23 +35,14 @@ __all__ = ('default_config', 'StrangeHadronsConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons -from StandardParticles import StdLooseAllPhotons ## from PhysConf.Selections import CombineSelection diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py index 5134ef543..0f973fc24 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py @@ -36,23 +36,14 @@ __all__ = ('default_config', 'StrangeSLConf', ) -import os -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import CombineParticles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles -from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles -from CommonParticles import StdNoPIDsDownElectrons -from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection +from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light from GaudiKernel.SystemOfUnits import MeV -from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons -from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0 from PhysConf.Selections import CombineSelection default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py index d2bc92f6c..f76088d68 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py @@ -36,7 +36,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from GaudiKernel.PhysicalConstants import c_light default_config = { 'NAME': 'Tau23Mu', @@ -74,7 +73,7 @@ class Tau23MuLinesConf(LineBuilder): tau_name = name+'Tau23Mu' tau_name_DST = name+'Tau23Mu_DST' tau_name_DST_3mu = name+'Tau23Mu_DST_3mu' - ds23PiTIS_name = name+'Ds23PiTIS' + name+'Ds23PiTIS' ds23Pi_name = name+'Ds23Pi' ds2PhiPi_name = name+'Ds2PhiPi' ds2PhiPi_name_DST = name+'Ds2PhiPi_DST' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py index 6f7caa01d..2e5401740 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py @@ -16,12 +16,10 @@ Exported symbols (use python help!): - ''' -from GaudiKernel.PhysicalConstants import c_light from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from Configurables import FilterDesktop, CombineParticles -from Gaudi.Configuration import * +from Configurables import CombineParticles __author__ = ['Marcin Chrzaszcz'] __date__ = '14/12/2012' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py index f4ee63f69..6b5cbfa74 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py @@ -9,14 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### from Configurables import TopoTauAlg, TopoVertexTool -from StandardParticles import StdLooseKaons -from StandardParticles import StdLoosePions, StdTightPions -from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions +from StandardParticles import StdLoosePions +from StandardParticles import StdNoPIDsPions from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter -from Gaudi.Configuration import * +from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano'] __date__ = '14/01/2014' diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py index 73f06f152..76ad4b5dd 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py @@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf', 'default_config') Stripping selection for B to three muons and a neutrino. """ -from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop -from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from LHCbKernel.Configuration import * # check if needed -from Configurables import SubstitutePID -from Configurables import SubPIDMMFilter ################# @@ -282,7 +279,6 @@ class B23MuNuConf(LineBuilder): ) # specify leptons to identify the muon candidate - RelInfoTools_fake_mumue = RelInfoTools_fake # RelInfoTools_fake_mumue[0] = { "Type" : "RelInfoMuonIDPlus", # "Variables" : ["MU_BDT"], # "DaughterLocations" : { @@ -416,14 +412,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dimuon """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, @@ -434,14 +429,13 @@ class B23MuNuConf(LineBuilder): """ Creates Jpsi as proxy for dielectron """ - from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection + from PhysSelPython.Wrappers import Selection from GaudiConfUtils.ConfigurableGenerators import CombineParticles # from Configurables import CombineParticles CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"], MotherCut="ALL") - sel_name = "Jpsi" from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py index bbb6591f6..8bd9a436e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py @@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons __all__ = ('B2DMuForTauMuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py index 51c5a39b0..3ffd86fc0 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py @@ -13,14 +13,13 @@ __date__ = '23/07/2010' __version__ = '$Revision: 5.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons from StrippingB2DMuNuXUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('B2DMuNuXAllLinesConf', 'default_config') diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py index 34c3af4e6..efaa9d2a1 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py @@ -13,11 +13,9 @@ __date__ = '06/03/2015' __version__ = '$Revision: 0.0 $' from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles +from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand from StrippingConf.StrippingLine import StrippingLine -from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons def BtoDlnuLine(module_name, diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py index 0c8d00bd9..b05a05c95 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py @@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $' from Gaudi.Configuration import * from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons -from Configurables import ConjugateNeutralPID -from PhysSelPython.Wrappers import MergedSelection +from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('B2DMuForLNuconf', # 'makeb2DMuX', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py index 3f6fd96ad..e98d2b485 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py @@ -12,12 +12,11 @@ __author__ = ['Michel De Cian'] __date__ = '12/12/2018' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0 +from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0 __all__ = ('B2Dst0MuNuAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py index 6abd041bf..3a91f70e6 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py @@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen'] __date__ = '04/04/2015' __version__ = '$Revision: 0.0 $' -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from GaudiConfUtils.ConfigurableGenerators import CombineParticles +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py index 59745cf95..8839d6b97 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py @@ -15,12 +15,7 @@ __version__ = '$Revision: 0.0 $' These are some lines for measuring the BF of Lc->pKpi and Ds->KKpi """ -from Gaudi.Configuration import * -from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand -from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions __all__ = ('B2InvisAllLinesConf', 'default_config') @@ -267,7 +262,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ Filter ##### def _BpFilter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True) @@ -284,7 +279,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ same-sign Filter ##### def _Bp_SSFilter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi+]cc"], ReFitPVs=True) @@ -301,7 +296,7 @@ class B2InvisAllLinesConf(LineBuilder): ##### B+ fake proton Filter ##### def _Bp_fakeP_Filter(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _XuPi = CombineParticles( DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py index ab951b0df..bf18b6074 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Mark Smith'] __date__ = '17/10/2016' __version__ = '$Revision: 1.0 $' @@ -107,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -448,7 +445,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal ###### def _bhad2PMuX_B(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -465,7 +462,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Signal for Topo Line ###### def _bhad2PMuX_BTopo(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) @@ -482,7 +479,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): ###### B->ppMuNu Same-Sign protons ###### def _bhad2PMuX_B_SS(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py index 27a551c0c..4a7e33c3b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py @@ -762,7 +762,6 @@ class B2XTauNuAllLinesConf(LineBuilder): self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__() from StrippingConf.StrippingLine import StrippingLine - from PhysSelPython.Wrappers import SelectionSequence # TisTos filter def filterTisTos(name, Input, myTisTosSpecs): @@ -1633,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder): def __MakeTau23pi__(self): from PhysSelPython.Wrappers import DataOnDemand - from CommonParticles import StdLooseDetachedTauNoPID self.tau23piSel = DataOnDemand(Location=self.tau_path) @@ -1699,7 +1697,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterD02K3pi__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions, StdLooseKaons CombD02K3pi = CombineParticles( @@ -1720,7 +1718,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterD02K3piForDst__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions, StdLooseKaons CombD02K3piForDst = CombineParticles( @@ -1741,7 +1739,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterDstarD02K3pi__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions CombDstar2piD02K3pi = CombineParticles( @@ -1759,7 +1757,7 @@ class B2XTauNuAllLinesConf(LineBuilder): def __FilterDstarD02K3piWS__(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdAllLoosePions CombDstar2piD02K3piWS = CombineParticles( @@ -1850,7 +1848,6 @@ class B2XTauNuAllLinesConf(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import FilterDesktop from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseJpsi2MuMu JpsiForBc = FilterDesktop( Code=self.totalJpsiCut @@ -1869,7 +1866,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar02DstarPi = CombineParticles( @@ -1889,8 +1886,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1914,8 +1910,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1941,8 +1936,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -1968,7 +1962,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -1992,8 +1985,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*- tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2018,8 +2010,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2045,8 +2036,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2072,8 +2062,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2100,8 +2089,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2129,7 +2117,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2155,8 +2142,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D0(->K3pi) tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2183,8 +2169,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2213,7 +2198,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2241,8 +2225,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> D- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2268,8 +2251,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2296,7 +2278,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2320,8 +2301,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2347,8 +2327,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2376,7 +2355,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2401,8 +2379,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B_c+ -> J/psi(1S) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2428,7 +2405,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2452,8 +2428,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B_s0 -> D_s- tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2479,8 +2454,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2507,7 +2481,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2532,8 +2505,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [Lambda_b0 -> Lambda_c+ tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2561,8 +2533,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2588,8 +2559,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [Lambda_b0 -> p+ tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2614,8 +2584,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2641,7 +2610,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2668,8 +2636,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of inverted vertex cut only first, should boost the overall efficiency """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2695,8 +2662,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of inverted vertex cut only first, should boost the overall efficiency """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2720,8 +2686,7 @@ class B2XTauNuAllLinesConf(LineBuilder): Also useful for studying background in B0 -> D* tau nu when pi- from D** decay is missed """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2746,8 +2711,7 @@ class B2XTauNuAllLinesConf(LineBuilder): Also useful for studying WS background in B0 -> D* tau nu when pi+ from D** decay is missed """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2773,7 +2737,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTauNonPhys MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2798,7 +2761,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseResolvedPi0 CombDStar02Pi0D0 = CombineParticles( @@ -2817,8 +2780,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D*0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2842,8 +2804,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2868,7 +2829,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2892,7 +2852,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLooseAllPhotons CombDStar02GammaD0 = CombineParticles( @@ -2911,8 +2871,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B- -> D*0 tau-]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2936,8 +2895,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -2962,7 +2920,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -2985,7 +2942,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles( @@ -3004,8 +2961,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3029,8 +2985,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3055,7 +3010,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') @@ -3078,7 +3032,7 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import Selection from StandardParticles import StdLoosePions CombDdoubleStar2PiDstar02GammaD0 = CombineParticles( @@ -3097,8 +3051,7 @@ class B2XTauNuAllLinesConf(LineBuilder): [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3122,8 +3075,7 @@ class B2XTauNuAllLinesConf(LineBuilder): use of wrong charge combination is useful for background subtraction """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau + from PhysSelPython.Wrappers import Selection # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles') # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path) @@ -3148,7 +3100,6 @@ class B2XTauNuAllLinesConf(LineBuilder): """ from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection, DataOnDemand - from CommonParticles import StdLooseDetachedTau MyStdLooseDetachedTau = DataOnDemand( Location='Phys/StdLooseDetachedTau3piNonPhys/Particles') diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py index 73ab1a2a4..b59084d79 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder): # Bs -> K*/Kspi e nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e- pi+", @@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseElectrons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> e+ pi-", diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py index e990a0f5f..7dbf8f670 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian'] __date__ = '11/01/2019' __version__ = '$Revision: 1.6 $' @@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand + from PhysSelPython.Wrappers import DataOnDemand self._stdVeryLooseKsLL = DataOnDemand( "Phys/StdVeryLooseKsLL/Particles") self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles") @@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder): # Bs -> K*/Kspi mu nu lines def _Kstar_line(self): - NoPS = self.config['NoPrescales'] + self.config['NoPrescales'] from StrippingConf.StrippingLine import StrippingLine return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0, FILTER=self.GECs, @@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder): if self._KSSel is not None: return self._KSSel - from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop - from PhysSelPython.Wrappers import Selection, DataOnDemand + from GaudiConfUtils.ConfigurableGenerators import FilterDesktop + from PhysSelPython.Wrappers import Selection _code = FilterDesktop(Code=self._NominalKsSelection() % self._config) @@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770 = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770NoPID = CombineParticles( DecayDescriptors=["rho(770)0 -> pi- pi+"], @@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770WS = CombineParticles( DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"], @@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions _rho770SB = CombineParticles( DecayDescriptors=["rho(770)0 -> pi+ pi-"], @@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu- pi+", @@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdLoosePions, StdLooseMuons + from StandardParticles import StdLoosePions _Ksh = CombineParticles( DecayDescriptor="KS0 -> mu+ pi-", diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py index 599af631e..dd86fee48 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py @@ -11,9 +11,7 @@ __author__ = ['Adam Davis'] __date__ = '12/03/2021' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from StrippingUtils.Utils import LineBuilder -import logging """ Selections for Bc -> Bs X @@ -173,7 +171,6 @@ class Bc2BsBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) self.config = config - from PhysSelPython.Wrappers import Selection, DataOnDemand # GECs for # long tracks self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -492,7 +489,6 @@ class Bc2BsBuilder(LineBuilder): return self._Ds2KKpiSel from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions, StdAllLooseKaons _Ds2KKpi = CombineParticles( DecayDescriptors=["[D_s+ -> K+ K- pi+]cc"], @@ -515,7 +511,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions, StdAllLooseKaons _Phi2KK = CombineParticles( DecayDescriptors=["phi(1020) -> K+ K-"], @@ -537,7 +532,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLooseMuons _Jpsi2mumu = CombineParticles( DecayDescriptors=["J/psi(1S) -> mu+ mu-"], @@ -582,7 +576,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLoosePions _Bs2DsPi = CombineParticles( DecayDescriptors=["[ B_s0 -> D_s- pi+ ]cc", @@ -605,7 +598,6 @@ class Bc2BsBuilder(LineBuilder): from GaudiConfUtils.ConfigurableGenerators import CombineParticles from PhysSelPython.Wrappers import Selection - from StandardParticles import StdAllLooseKaons _Bs2DsK = CombineParticles( DecayDescriptors=["[ B_s0 -> D_s- K+ ]cc", "[B_s0 -> D_s+ K+]cc"], diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py index a80fcb301..ddaec2925 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py @@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons -from Configurables import TisTosParticleTagger +from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf', 'TOSFilter', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py index 827fcbc76..230adf6c8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py @@ -16,14 +16,13 @@ __author__ = ['Scott Ely'] __date__ = '23/01/2019' __version__ = '$Revision: 1.0 $' -from Gaudi.Configuration import * from Configurables import FilterDesktop, CombineParticles -from PhysSelPython.Wrappers import Selection, DataOnDemand +from PhysSelPython.Wrappers import Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder -from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL, StdLooseLambdaLL, StdLooseLambdaDD -from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from StandardParticles import StdLooseLambdaDD, StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL +from StandardParticles import StdNoPIDsMuons +from GaudiKernel.SystemOfUnits import GeV, MeV, mm __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config') diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py index cd969d689..8fc20aaf9 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe'] __date__ = '19/01/2014' __version__ = '$Revision: 1.0 $' @@ -137,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py index 9003d470a..9d2d80fb9 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py @@ -26,7 +26,7 @@ from StrippingUtils.Utils import LineBuilder from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons # from StrippingSemilepISRUtils import * -from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from CommonParticles.Utils import * __all__ = ('SemilepISRAllLinesConf', diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py index e89305332..7ce8d0135 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py @@ -9,9 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -import logging from StrippingUtils.Utils import LineBuilder -from Gaudi.Configuration import * __author__ = ['William Sutcliffe', 'Patrick Owen'] __date__ = '02/12/2015' __version__ = '$Revision: 2.0 $' @@ -132,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - from PhysSelPython.Wrappers import Selection, DataOnDemand self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} @@ -455,7 +452,7 @@ class bhad2PMuXBuilder(LineBuilder): ###### Lb->pMuNu High M_corr Opposite Sign ###### def _bhad2PMuX_Lb(self): from GaudiConfUtils.ConfigurableGenerators import CombineParticles - from PhysSelPython.Wrappers import Selection, MergedSelection + from PhysSelPython.Wrappers import Selection _pMu = CombineParticles( DecayDescriptors=self._config["DECAYS"], ReFitPVs=True) diff --git a/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py b/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py index e2b92b9b4..70da4ddf5 100644 --- a/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py +++ b/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py @@ -25,7 +25,7 @@ from Configurables import ProcStatusCheck from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream +from StrippingConf.Configuration import StrippingConf from Configurables import DecodeRawEvent from Configurables import TrackStateProvider from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py b/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py index 85475108a..44b31cf0a 100644 --- a/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py +++ b/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py @@ -21,11 +21,11 @@ from DSTWriters.Configuration import (SelDSTWriter, stripDSTStreamConf, stripDSTElements ) -from Configurables import ProcStatusCheck, GaudiSequencer +from Configurables import ProcStatusCheck from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream +from StrippingConf.Configuration import StrippingConf from Configurables import TrackSys from Configurables import DecodeRawEvent from Configurables import TrackStateProvider diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py b/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py old mode 100755 new mode 100644 index 6c97ff3e8..6fd6fd493 --- a/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py +++ b/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from Gaudi.Configuration import * from Configurables import DaVinci from StrippingConf.Configuration import StrippingConf diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py old mode 100755 new mode 100644 index a397db70e..51a7832a6 --- a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py +++ b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py old mode 100755 new mode 100644 index e09a840cc..f2c40ff2e --- a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py +++ b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py b/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py old mode 100755 new mode 100644 index daf439c27..636f68477 --- a/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py +++ b/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import DecodeRawEvent from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py b/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py index 0716da5c6..31a5057d5 100644 --- a/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py +++ b/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * from Configurables import DaVinci # Number of events etc. diff --git a/Phys/StrippingSelections/tests/coordinators/get_correlations.py b/Phys/StrippingSelections/tests/coordinators/get_correlations.py index 44d4f4bd5..82323f326 100644 --- a/Phys/StrippingSelections/tests/coordinators/get_correlations.py +++ b/Phys/StrippingSelections/tests/coordinators/get_correlations.py @@ -12,9 +12,6 @@ ################################################################################################ from ROOT import * -import os -from copy import copy -from math import sqrt corr = {} listAlgs = [] diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py old mode 100755 new mode 100644 index cd487941e..0ba344903 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py old mode 100755 new mode 100644 index a58e2ad79..879ab124b --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py old mode 100755 new mode 100644 index f5f5a2b9b..35e0f49ab --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py old mode 100755 new mode 100644 index 52892d780..f92bfeb86 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py old mode 100755 new mode 100644 index c9558ca66..fd3df0b58 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py old mode 100755 new mode 100644 index e57f7cc8a..454fe0a47 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py old mode 100755 new mode 100644 index f4cf24f0d..a22b793b0 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py old mode 100755 new mode 100644 index d71b84f05..d5e7110eb --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py old mode 100755 new mode 100644 index b3bd32d29..fff71e792 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py old mode 100755 new mode 100644 index 78714285e..4398fdae7 --- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py @@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTStreamConf, stripMicroDSTElements, stripCalibMicroDSTStreamConf) -from Configurables import TupleToolStripping -from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor @@ -25,8 +23,8 @@ from DSTWriters.microdstelements import * from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream -from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck +from StrippingConf.Configuration import StrippingConf +from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck from Gaudi.Configuration import * from CommonParticlesArchive import CommonParticlesArchiveConf stripping = 'Stripping34r0p1' diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py b/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py old mode 100755 new mode 100644 index 03e39d222..2d4789a74 --- a/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py +++ b/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py @@ -15,7 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter, stripMicroDSTElements, stripCalibMicroDSTStreamConf) from Configurables import EventTuple, TupleToolEventInfo -from Configurables import TupleToolStripping from Configurables import EventTuple from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport @@ -27,7 +26,7 @@ from Configurables import ProcStatusCheck from StrippingArchive import strippingArchive from StrippingArchive.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration -from StrippingConf.Configuration import StrippingConf, StrippingStream +from StrippingConf.Configuration import StrippingConf from Configurables import DecodeRawEvent from Configurables import RawEventJuggler from StrippingConf.Configuration import StrippingConf diff --git a/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py b/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py index 83e4ae076..b93f546aa 100644 --- a/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py +++ b/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py @@ -11,7 +11,6 @@ from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Collision13/FULL.DST/00023836/0000/00023836_00000538_1.full.dst', diff --git a/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py b/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py index 8d30cb209..b5115d257 100644 --- a/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py +++ b/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_restripping_collision11_reco14"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py b/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py index 0c831466d..f2e56a7a8 100644 --- a/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py +++ b/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_restripping_collision12_reco14"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py b/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py index 24e4ebdcf..833a71803 100644 --- a/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py +++ b/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py @@ -41,7 +41,6 @@ # -- ExtraPackages : AppConfig.v3r172;SQLDDDB.v7r9 # -- Visible : Y -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'PFN:/castor/cern.ch/grid/lhcb/LHCb/Protonion13/FULL.DST/00024845/0000/00024845_00009990_1.full.dst' diff --git a/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py b/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py index d36dc2f7b..49aaf4628 100644 --- a/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py +++ b/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py @@ -11,7 +11,6 @@ from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Protonion13/FULL.DST/00032860/0000/00032860_00005453_1.full.dst', diff --git a/Phys/StrippingSelections/tests/data/Reco15_NoBias.py b/Phys/StrippingSelections/tests/data/Reco15_NoBias.py index f392b9992..b337f2db6 100644 --- a/Phys/StrippingSelections/tests/data/Reco15_NoBias.py +++ b/Phys/StrippingSelections/tests/data/Reco15_NoBias.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088641_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088646_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088652_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088655_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088665_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088685_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088689_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088693_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088696_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088704_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088711_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088717_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088723_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088728_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088735_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088739_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088743_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088751_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088756_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088760_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088764_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088767_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088773_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088777_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088781_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088785_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088789_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088794_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088800_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088805_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088809_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088813_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088819_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088823_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088827_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088833_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088838_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088842_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088846_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088850_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088866_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088872_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088878_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088883_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088889_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088893_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088898_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088903_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088924_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088949_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088970_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088992_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089016_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089031_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089036_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089046_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089050_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089055_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089060_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089064_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089068_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089073_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089078_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089081_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089086_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089090_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089095_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089101_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089105_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089119_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089123_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089130_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089136_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089139_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089153_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089164_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089168_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089173_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089183_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089203_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089226_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089249_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089280_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089294_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089309_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089315_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089321_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089328_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089332_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089346_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089368_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089384_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089388_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089393_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089398_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089402_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089407_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089412_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089416_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089420_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089425_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089430_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089434_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089439_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089442_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089450_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089457_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089522_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089545_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089556_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089573_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089593_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089598_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089602_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089607_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089614_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089618_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089621_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089626_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089635_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089640_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089644_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089653_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089676_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089701_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089722_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089754_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089777_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089781_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089786_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089790_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089795_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089802_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089807_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089811_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089814_NoBias_2015_0xEE63_Hlt.dst' diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py index f3ed992e6..9e469a5eb 100644 --- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py +++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Lead15/RDST/00050695/0000/00050695_00000433_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py index c8fb7ab5d..0d9eadb80 100644 --- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2015' diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py index b28b1c5bf..c2c34c0a2 100644 --- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py +++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Lead15/RDST/00050695/0001/00050695_00013415_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py index c8fb7ab5d..0d9eadb80 100644 --- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2015' diff --git a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py index 63025ab49..310762304 100644 --- a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py +++ b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_restripping_collision15_reco15a"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py index 6caabebf0..c5c90751a 100644 --- a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2015' diff --git a/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py b/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py index 596977907..890915a9b 100644 --- a/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py +++ b/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py @@ -11,7 +11,6 @@ # lb-run LHCbDirac/prod dirac-bookkeeping-get-files -B /LHCb/Lead15/Beam6370GeV-VeloClosed-MagDown/RealData/Reco16LeadSmog/90300000/RDST --Runs 168665 from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Lead15/RDST/00058255/0002/00058255_00029696_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py index c10bed737..51244624e 100644 --- a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py +++ b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_restripping_collision16_reco16"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py index 0d5c699c6..cbd00ca82 100644 --- a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2016' diff --git a/Phys/StrippingSelections/tests/data/Reco16_Run179101.py b/Phys/StrippingSelections/tests/data/Reco16_Run179101.py index 6bf1346f6..f0052cbbf 100644 --- a/Phys/StrippingSelections/tests/data/Reco16_Run179101.py +++ b/Phys/StrippingSelections/tests/data/Reco16_Run179101.py @@ -26,7 +26,6 @@ # Trigger per bunch: 3.69 events/s/bunch from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Collision16/RDST/00051872/0018/00051872_00189670_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py b/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py index 2638154d5..518c493d2 100644 --- a/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py +++ b/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py @@ -15,7 +15,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Protonargon15/FULL.DST/00051869/0000/00051869_00000400_1.full.dst', diff --git a/Phys/StrippingSelections/tests/data/Reco16_pHe.py b/Phys/StrippingSelections/tests/data/Reco16_pHe.py index a30cf8458..22b22b546 100644 --- a/Phys/StrippingSelections/tests/data/Reco16_pHe.py +++ b/Phys/StrippingSelections/tests/data/Reco16_pHe.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'LFN:/lhcb/LHCb/Protonhelium16/RDST/00055503/0000/00055503_00000489_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py b/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py index d6e2eab97..824419396 100644 --- a/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py +++ b/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Protonion16/FULL.DST/00055643/0000/00055643_00000165_1.full.dst', 'LFN:/lhcb/LHCb/Protonion16/FULL.DST/00055643/0000/00055643_00000166_1.full.dst', diff --git a/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py b/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py index dd3f415c6..edf8b7506 100644 --- a/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py +++ b/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Ionproton16/FULL.DST/00055929/0000/00055929_00001117_1.full.dst', 'LFN:/lhcb/LHCb/Ionproton16/FULL.DST/00055929/0000/00055929_00001118_1.full.dst', diff --git a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py index c5a62095c..bb88d6e2c 100644 --- a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py +++ b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_restripping_collision17_reco17"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py index dd34c421c..2c36112ba 100644 --- a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2017' diff --git a/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py b/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py index 77c4f1998..7244a139c 100644 --- a/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2017' diff --git a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py index 9d212cdd7..5fee6fd6d 100644 --- a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py +++ b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ "LFN:/lhcb/LHCb/Collision17/RDST/00073870/0000/00073870_00005160_1.rdst", diff --git a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py index 77c4f1998..7244a139c 100644 --- a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2017' diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py index 792718e70..6a091822c 100644 --- a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py +++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py @@ -10,7 +10,6 @@ ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(["LFN:/lhcb/LHCb/Lead18/RDST/00083198/0000/00083198_00003427_1.rdst", "LFN:/lhcb/LHCb/Lead18/RDST/00083198/0001/00083198_00010614_1.rdst", diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py index 935b3d0d0..281644c95 100644 --- a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py index a80498b13..bcfb71d32 100644 --- a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py +++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py @@ -10,7 +10,6 @@ ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_stripping_PbPbcollision18_reco18"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py index 06df978e6..319a94e1e 100644 --- a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py index 6f74e1ef9..2b8029e84 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py +++ b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from Configurables import DaVinci from PRConfig import TestFileDB TestFileDB.test_file_db["TestData_restripping_collision18_reco18"].run( diff --git a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py index 5304e36fe..4d68a2ef2 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206538.py b/Phys/StrippingSelections/tests/data/Reco18_Run206538.py index b4ca826bc..a120e80fa 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run206538.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run206538.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Collision18/RDST/00074101/0000/00074101_00000005_1.rdst', 'LFN:/lhcb/LHCb/Collision18/RDST/00074101/0000/00074101_00000006_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py index 465b37a0a..f7ae5e93f 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py index 52738267a..de0d84436 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py @@ -15,7 +15,6 @@ # lb-run LHCbDirac/prod dirac-bookkeeping-get-files -B /validation/Collision18/Beam6500GeV-VeloClosed-MagUp/RealData/Reco18/90000000/RDST from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['LFN:/lhcb/validation/Collision18/RDST/00073878/0000/00073878_00000014_1.rdst', 'LFN:/lhcb/validation/Collision18/RDST/00073878/0000/00073878_00000015_1.rdst' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py index 465b37a0a..f7ae5e93f 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run209291.py b/Phys/StrippingSelections/tests/data/Reco18_Run209291.py index df409951a..291ea87a9 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run209291.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run209291.py @@ -16,7 +16,6 @@ # -- Extra information about the data processing phases: from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030781_1.rdst', 'LFN:/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030844_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py index 465b37a0a..f7ae5e93f 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run214741.py b/Phys/StrippingSelections/tests/data/Reco18_Run214741.py index c04fc0f99..ccf01af6d 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run214741.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run214741.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst', 'LFN:/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119590_1.rdst', diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py index 465b37a0a..f7ae5e93f 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py index 430182317..3ff1c02e0 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py index 430182317..3ff1c02e0 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py +++ b/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci, Stripping +from Configurables import DaVinci from Gaudi.Configuration import importOptions DaVinci().DataType = '2018' diff --git a/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py b/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py index 9d597e0a9..6c3fb6578 100644 --- a/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py +++ b/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py @@ -9,8 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from Gaudi.Configuration import FileCatalog -from Gaudi.Configuration import * -from Configurables import DaVinci from GaudiConf import IOHelper IOHelper('ROOT').inputFiles( diff --git a/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py b/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py index 5f11554d6..fff981778 100644 --- a/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py +++ b/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py @@ -41,7 +41,6 @@ # -- ExtraPackages : AppConfig.v3r214;SQLDDDB.v7r10 # -- Visible : N -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles(['root://eoslhcb.cern.ch//eos/lhcb/user/a/acontu/FULLDST_TrifFiltEM.dst', # 'LFN:/lhcb/validation/Collision15em/FULL.DST/00045500/0000/00045500_00000367_1.full.dst', diff --git a/Phys/StrippingSelections/tests/data/validationReco2015a.py b/Phys/StrippingSelections/tests/data/validationReco2015a.py index 82309b837..ce69c3ae7 100644 --- a/Phys/StrippingSelections/tests/data/validationReco2015a.py +++ b/Phys/StrippingSelections/tests/data/validationReco2015a.py @@ -41,7 +41,6 @@ # -- ExtraPackages : AppConfig.v3r214;SQLDDDB.v7r10 # -- Visible : N -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ 'root://by32-4.grid.sara.nl:1094/pnfs/grid.sara.nl/data/lhcb/buffer/lhcb/validation/Collision15em/FULL.DST/00045500/0000/00045500_00000204_1.full.dst' diff --git a/Phys/StrippingSelections/tests/data/validationReco2016.py b/Phys/StrippingSelections/tests/data/validationReco2016.py index 4877291ec..c20e2944a 100644 --- a/Phys/StrippingSelections/tests/data/validationReco2016.py +++ b/Phys/StrippingSelections/tests/data/validationReco2016.py @@ -41,7 +41,6 @@ # -- ExtraPackages : AppConfig.v3r264;SQLDDDB.v7r10 # -- Visible : Y -from Gaudi.Configuration import * from GaudiConf import IOHelper IOHelper('ROOT').inputFiles([ "root://fly7.grid.sara.nl:1094/pnfs/grid.sara.nl/data/lhcb/buffer/lhcb/validation/Collision16/FULL.DST/00051034/0000/00051034_00000916_1.full.dst", diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py old mode 100755 new mode 100644 index d76594f84..527e74722 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import RawEventJuggler from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py old mode 100755 new mode 100644 index e4b00cc02..91ad491e2 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py @@ -28,7 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from PhysConf.Filters import LoKi_Filters from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py old mode 100755 new mode 100644 index 0c6b9fe60..629f4c0a9 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py @@ -28,8 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from PhysConf.Filters import LoKi_Filters from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py old mode 100755 new mode 100644 index 8e827780e..e5dfb8067 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py @@ -28,8 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from PhysConf.Filters import LoKi_Filters from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py old mode 100755 new mode 100644 index 1746867ed..bad1ad602 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import ConfigCDBAccessSvc from Configurables import DecodeRawEvent diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py old mode 100755 new mode 100644 index 790c17aa8..e5a330300 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import ConfigCDBAccessSvc from Configurables import DecodeRawEvent diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py old mode 100755 new mode 100644 index c625f9638..dfa89c385 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py old mode 100755 new mode 100644 index f3cd1e331..a64eb7c4c --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py @@ -26,8 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import DecodeRawEvent from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index e67450c12..a08a129ec --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index 472e737aa..f57d14bdf --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 723ae803f..6473e04c6 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index a472261ff..6ec2c569f --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 1dad1f73b..8125ec64e --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index e4aca880a..f280356ad --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 1dad1f73b..8125ec64e --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index 12e09b6ad..dd54fc063 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 2b83e6b5f..5a4915aaf --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index 543cadf01..7024a94d0 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 4eb12af96..cd0f23bfe --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index 86d432e79..675ec8165 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import config_from_modules from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index f58b16624..1b6d8579e --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index ccc03121a..2c7a52c23 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import config_from_modules from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py index 80047825a..5b94b030e 100644 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py @@ -29,7 +29,6 @@ from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Adam Morris'] __date__ = '26/08/2014' __version__ = '$Revision: 2.0$' diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py index f1e3fd653..5f8634e17 100644 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py @@ -25,11 +25,7 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllLoosePions from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Fred Blanc - Neus Lopez March'] __date__ = '16/2/2011' __version__ = '$Revision: 1.0 $' @@ -160,7 +156,7 @@ class B2Psi2SXConf(LineBuilder): LineBuilder.__init__(self, name, config) incl = self.name + '_InclPsi2SToJpsiPiPi' - incl_detached_name = incl + 'Detached' + incl + 'Detached' sig = self.name + '_Bs2Psi2SPhiJpsiPiPi' K = self.name + '_Bu2Psi2SKJpsiPiPi' Kstar = self.name + '_Bd2Psi2SKstarJpsiPiPi' diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py index 14129daeb..10a332681 100644 --- a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py +++ b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py @@ -26,11 +26,7 @@ Exported symbols (use python help!): from StrippingUtils.Utils import LineBuilder from StrippingConf.StrippingLine import StrippingLine from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection -from StandardParticles import StdAllLooseKaons -from StandardParticles import StdAllLooseMuons -from StandardParticles import StdAllLoosePions from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles -from Gaudi.Configuration import * __author__ = ['Neus Lopez March'] __date__ = '16/2/2011' __version__ = '$Revision: 1.0 $' diff --git a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py index 365ac9982..c5a13a38b 100644 --- a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py +++ b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py @@ -16,17 +16,14 @@ from DSTWriters.Configuration import (SelDSTWriter, stripDSTStreamConf, - stripDSTElements, - stripMicroDSTStreamConf, - stripMicroDSTElements, - stripCalibMicroDSTStreamConf) + stripDSTElements) from Configurables import AlgorithmCorrelationsAlg from Configurables import StrippingReport from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py index 1eebd8af8..4db70bd4f 100644 --- a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py +++ b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 081efc20a..c5a438962 --- a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py @@ -27,7 +27,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import RootCnvSvc from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py old mode 100755 new mode 100644 index fd12d313d..078145f92 --- a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py @@ -27,7 +27,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import config_from_modules from Configurables import TrackStateProvider from Configurables import RootCnvSvc diff --git a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py old mode 100755 new mode 100644 index edb87074a..098ef7d56 --- a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py old mode 100755 new mode 100644 index ac8bfef43..2ff6990cb --- a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py @@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py old mode 100755 new mode 100644 index ec5ca39d3..36efb7a6d --- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py +++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 744182bd6..93e3484eb --- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py old mode 100755 new mode 100644 index b751b157b..6650ebff3 --- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import config_from_modules from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py old mode 100755 new mode 100644 index 23f92a658..100dff3be --- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py +++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py @@ -32,7 +32,7 @@ from Configurables import GaudiSequencer import os from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Configurables import RawEventJuggler from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 24bb05e4a..dd4144004 --- a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py old mode 100755 new mode 100644 index 55e7e4a3a..c33fcce6a --- a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import config_from_modules from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py b/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py old mode 100755 new mode 100644 index d5390ed39..2454250c2 --- a/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py +++ b/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import RawEventJuggler from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py b/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py old mode 100755 new mode 100644 index 6fa0f5bee..0e800f1e3 --- a/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py +++ b/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py @@ -31,7 +31,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from StrippingConf.Configuration import StrippingConf diff --git a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py old mode 100755 new mode 100644 index 3699b6e38..751679b64 --- a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py +++ b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py @@ -32,7 +32,7 @@ from Configurables import AddressKillerAlg from Configurables import GaudiSequencer from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Configurables import RawEventJuggler from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py old mode 100755 new mode 100644 index b3229f9d3..a6a5dcb37 --- a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py +++ b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py @@ -32,7 +32,7 @@ from Configurables import AddressKillerAlg from Configurables import GaudiSequencer from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Configurables import RawEventJuggler from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py b/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py old mode 100755 new mode 100644 index 9c472e22d..0dd3e1e4a --- a/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py @@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Gaudi.Configuration import * from Configurables import DaVinci diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py old mode 100755 new mode 100644 index 7cd1e1b0e..48e3dcbf2 --- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py +++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import RootCnvSvc from Gaudi.Configuration import * diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py old mode 100755 new mode 100644 index 89a064ab4..d1c155cd1 --- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py +++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py @@ -28,7 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from PhysConf.Filters import LoKi_Filters from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py old mode 100755 new mode 100644 index a8f2c2945..8a8dc4542 --- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py +++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py @@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import config_from_modules from Configurables import TrackStateProvider from Configurables import RootCnvSvc diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py old mode 100755 new mode 100644 index a74525048..f64a2bc87 --- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py +++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py @@ -28,8 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from PhysConf.Filters import LoKi_Filters from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreams -from StrippingSelections import buildersConf +from StrippingSelections.Utils import buildStreams from StrippingSettings.Utils import strippingConfiguration from Configurables import DecodeRawEvent from Configurables import RawEventJuggler diff --git a/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py b/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py index ab234fdfd..1540477d9 100644 --- a/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py +++ b/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py @@ -70,7 +70,7 @@ init.Members += palgs def removeUnpacking(): - from Configurables import DataOnDemandSvc, CaloProcessor + from Configurables import DataOnDemandSvc DataOnDemandSvc().AlgMap.pop("/Event/Rec/ProtoP/Neutrals", None) DataOnDemandSvc().AlgMap.pop("/Event/Rec/ProtoP/Charged", None) DataOnDemandSvc().AlgMap.pop("/Event/Rec/Calo/Electrons", None) diff --git a/Phys/StrippingSelections/tests/users/StrippingTupleExample.py b/Phys/StrippingSelections/tests/users/StrippingTupleExample.py index 7977ff285..cf71dbdd2 100644 --- a/Phys/StrippingSelections/tests/users/StrippingTupleExample.py +++ b/Phys/StrippingSelections/tests/users/StrippingTupleExample.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Configurables import DaVinci from StrippingTuple import add_stripping_tuple_sequence import sys import os diff --git a/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py b/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py old mode 100755 new mode 100644 index 48a131f37..71bc23b21 --- a/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py +++ b/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py @@ -28,7 +28,7 @@ from Configurables import AuditorSvc, ChronoAuditor from Configurables import TimingAuditor, SequencerTimerTool from DSTWriters.microdstelements import * from Configurables import ProcStatusCheck -from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder +from StrippingSelections.Utils import buildStreamsFromBuilder from StrippingSelections import buildersConf from Configurables import DecodeRawEvent from Gaudi.Configuration import * diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py index eae3b92d7..eb6d3890c 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py @@ -15,7 +15,6 @@ ## Contact person: Piera Muzzetto (piera.muzzetto@cern.ch) ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # StrippingBetaSBd2JpsieeKstarDetachedLine (MicroDST) diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py index f44352310..9ebd6e641 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py @@ -15,7 +15,6 @@ ## Contact person: Shunan Zhang (shunan.zhang@cern.ch) ## ######################################################################################################### -from GaudiKernel.SystemOfUnits import * Beauty2Charm = { 'BUILDERTYPE': 'Beauty2CharmConf', diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py index 39dba8ea0..b03b16207 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py @@ -15,7 +15,6 @@ ## Contact person: Piera Muzzetto (piera.muzzetto@cern.ch) ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # StrippingBetaSBd2JpsieeKstarDetachedLine (MicroDST) diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py index 922168f7c..ef453ed39 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py @@ -15,7 +15,6 @@ ## Contact person: Shunan Zhang (shunan.zhang@cern.ch) ## ######################################################################################################### -from GaudiKernel.SystemOfUnits import * Beauty2Charm = { 'BUILDERTYPE': 'Beauty2CharmConf', diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py index 9b732f4d7..6a02abb11 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py @@ -15,7 +15,6 @@ ## Contact person: Jie Wu (j.wu@cern.ch) ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # StrippingB2JpsiHHBs2Jpsif0PrescaledLine (MicroDST) diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py index b04d4deb0..e7628be57 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py @@ -15,7 +15,6 @@ ## Contact person: Shunan Zhang (shunan.zhang@cern.ch) ## ######################################################################################################### -from GaudiKernel.SystemOfUnits import * Beauty2Charm = { 'BUILDERTYPE': 'Beauty2CharmConf', diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py index ef63e1ae4..247dd99b1 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py @@ -15,7 +15,6 @@ ## Contact person: Xuesong Liu (xuesong.liu@cern.ch) ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # StrippingB2JpsiHHBs2Jpsif0PrescaledLine (MicroDST) diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py index 3f89c191f..6d1ed9f04 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py @@ -15,7 +15,6 @@ ## Contact person: Alison Tully (alison.tully@cern.ch) ## ######################################################################################################### -from GaudiKernel.SystemOfUnits import * Beauty2Charm = { 'BUILDERTYPE': 'Beauty2CharmConf', diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py index 29b4aeea8..f246ebc34 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py @@ -15,7 +15,6 @@ ## Contact person: Xuesong Liu (xuesong.liu@cern.ch) ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # StrippingBetaSBd2JpsieeKstarDetachedLine (MicroDST) diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py index 25c425dba..50fcfcd0a 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py @@ -15,7 +15,6 @@ ## Contact person: Alison Tully (alison.tully@cern.ch) ## ######################################################################################################### -from GaudiKernel.SystemOfUnits import * Beauty2Charm = { 'BUILDERTYPE': 'Beauty2CharmConf', diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py index f35ccf51b..01dbc8323 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py @@ -15,7 +15,6 @@ ## Contact person: andrii.usachov@cern.ch ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py index 54006cc05..ec1abc714 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py @@ -15,7 +15,6 @@ ## Contact person: Jie Wu (j.wu@cern.ch) ## ################################################################################ -from GaudiKernel.SystemOfUnits import * ###################################################################### # StrippingB2JpsiHHBs2Jpsif0PrescaledLine (MicroDST) diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py index 9870225a4..7904982da 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py @@ -15,7 +15,6 @@ ## Contact person: Shunan Zhang (shunan.zhang@cern.ch) ## ######################################################################################################### -from GaudiKernel.SystemOfUnits import * Beauty2Charm = { 'BUILDERTYPE': 'Beauty2CharmConf', -- GitLab From fadf4e4dea1dd2782c6ab9e501dbce4c32435561 Mon Sep 17 00:00:00 2001 From: erodrigu <eduardo.rodrigues@cern.ch> Date: Fri, 31 Mar 2023 19:47:34 +0200 Subject: [PATCH 7/8] Remove empty lines with autopep8 --- .../Stripping24r2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping24r2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping24r2/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping24r2/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping24r2/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping24r2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping28r2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping28r2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping28r2/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping28r2/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping28r2/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping28r2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping28r2p1/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping28r2p1/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping28r2p1/StrippingSL/StrippingB23MuNu.py | 2 -- .../Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping30r2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping30r2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping30r2/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping30r2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping30r3/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping30r3/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping30r3/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping30r3/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping31r1/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping31r1/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping31r1/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping31r1/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping31r1/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping31r2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping31r2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping31r2/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping31r2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping33r2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping33r2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping33r2/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping33r2/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping33r2/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping33r2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping34/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping34/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping34/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping34/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping34/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping34/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping34/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping34/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping34r0p1/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping34r0p1/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping34r0p1/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping34r0p2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping34r0p2/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping34r0p2/StrippingSL/StrippingB23MuNu.py | 2 -- .../Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping35r2/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py | 1 - .../Stripping35r2/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping35r2/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping35r2/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping35r2/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping35r2/StrippingSL/Strippingbhad2PMuX.py | 1 - .../Stripping35r3/StrippingBandQ/StrippingXibc.py | 2 -- .../Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../Stripping35r3/StrippingRD/StrippingB2XTauMu.py | 1 - .../Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../Stripping35r3/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../Stripping35r3/StrippingRD/StrippingStrangeSL.py | 2 -- .../Stripping35r3/StrippingSL/StrippingB23MuNu.py | 1 - .../Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../Stripping35r3/StrippingSL/Strippingbhad2PMuX.py | 1 - Phys/StrippingNeuroBayes/options/TestBhh.py | 1 - Phys/StrippingNeuroBayes/options/TestNeuroBayes.py | 1 - .../python/StrippingSelections/StrippingBandQ/StrippingXibc.py | 2 -- .../StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py | 1 - .../StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py | 1 - .../python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py | 1 - .../StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py | 1 - .../StrippingSelections/StrippingRD/StrippingStrangeHadrons.py | 2 -- .../StrippingSelections/StrippingRD/StrippingStrangeSL.py | 2 -- .../python/StrippingSelections/StrippingSL/StrippingB23MuNu.py | 2 -- .../StrippingSL/StrippingB2PPbarMuForTauMu.py | 1 - .../StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py | 1 - .../StrippingSelections/StrippingSL/Strippingbhad2PMuX.py | 1 - 148 files changed, 185 deletions(-) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 4d4fe19ad..5eaa8cff0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 4d4fe19ad..5eaa8cff0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py index c90f7faea..766ad5b73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py index 76ad4b5dd..b59d48fb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py @@ -419,7 +419,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) @@ -436,7 +435,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi, RequiredSelections=[self.Electrons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py index bf18b6074..94a83f33e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py index 4d314b69f..73028a237 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py index 901009730..87ef9edba 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index e5c6f3efd..9b3c21203 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py index b82b80518..810e9a208 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py index 1311185e7..698e0dbb3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py index 1b49cee09..cb73631db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py @@ -193,7 +193,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 165fed745..04dfcfdef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -108,7 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py index af26a4266..233c320a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py index 81c8f0a63..00920929d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py @@ -133,7 +133,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py index 4d314b69f..73028a237 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py index 901009730..87ef9edba 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py index e5c6f3efd..9b3c21203 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py index b82b80518..810e9a208 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py index 1311185e7..698e0dbb3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py index 1b49cee09..cb73631db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py @@ -193,7 +193,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py index 165fed745..04dfcfdef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -108,7 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py index af26a4266..233c320a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py index 81c8f0a63..00920929d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py @@ -133,7 +133,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py index f04e44b1b..0e33808fb 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py index b82d67faa..a16db3ca6 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py index c42df20fe..29f8067fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py index 00749766b..70bb42a09 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py index 0dc895bd7..95c00a6d9 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py index 4d314b69f..73028a237 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py index 901009730..87ef9edba 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index e5c6f3efd..9b3c21203 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py index b82b80518..810e9a208 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py index 1311185e7..698e0dbb3 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py index 1b49cee09..cb73631db 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py @@ -193,7 +193,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 165fed745..04dfcfdef 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -108,7 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py index af26a4266..233c320a4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py index 81c8f0a63..00920929d 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py @@ -133,7 +133,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 4d4fe19ad..5eaa8cff0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py index c42df20fe..29f8067fd 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py index 00749766b..70bb42a09 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py index fd48ad00e..7801e0677 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py index 4d4fe19ad..5eaa8cff0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py index c90f7faea..766ad5b73 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py index 76ad4b5dd..b59d48fb8 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py @@ -419,7 +419,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) @@ -436,7 +435,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi, RequiredSelections=[self.Electrons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py index bf18b6074..94a83f33e 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py index 34f91df4e..ae690bbaa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('HeavyIonB2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py index 4d4fe19ad..5eaa8cff0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py index 6de8763c4..e6d9ba6ae 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py index 6de21fe14..97c4220c4 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py @@ -165,7 +165,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py index 4d4fe19ad..5eaa8cff0 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingNeuroBayes/options/TestBhh.py b/Phys/StrippingNeuroBayes/options/TestBhh.py index fd3961e2b..cd4387565 100644 --- a/Phys/StrippingNeuroBayes/options/TestBhh.py +++ b/Phys/StrippingNeuroBayes/options/TestBhh.py @@ -21,7 +21,6 @@ from Configurables import CombineParticles from Configurables import DaVinci - ######################################################################## # # Bs -> KK diff --git a/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py b/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py index 5cc10162c..885fd003d 100644 --- a/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py +++ b/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py @@ -21,7 +21,6 @@ from Configurables import CombineParticles from Configurables import DaVinci - ######################################################################## # # J/psi -> mu mu diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py index ca5c93c20..d0446cddf 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py @@ -47,14 +47,12 @@ __all__ = ('XibcBuilder' # LineBuilder class specialization ) - from Configurables import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_name = "Xibc" default_config = { diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py index c90f7faea..766ad5b73 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py @@ -25,7 +25,6 @@ __all__ = ('B2HHBDTLines', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import CombineParticles from StandardParticles import StdNoPIDsPions diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py index 2294a5bb7..6afaa37fa 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py @@ -28,7 +28,6 @@ from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder - default_config = { 'NAME': 'Bs2KSKS', 'WGs': ['BnoC'], diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py index c8e1fba1e..3bf392ac2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py @@ -25,7 +25,6 @@ __all__ = ('B2XTauMuConf', 'default_config') - from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles from PhysSelPython.Wrappers import Selection, MergedSelection from StrippingConf.StrippingLine import StrippingLine diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py index 345937d03..bfcf8336a 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py @@ -26,7 +26,6 @@ __version__ = "2.0" __all__ = ("default_config", "StrippingLb2L0GammaConf") - from Configurables import CombineParticles from GaudiConfUtils.ConfigurableGenerators import FilterDesktop diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py index e6fb5c31d..e2488a937 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py @@ -36,8 +36,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py index 0f973fc24..26590be4b 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py @@ -37,8 +37,6 @@ __all__ = ('default_config', ) - - from PhysSelPython.Wrappers import DataOnDemand, Selection from StrippingConf.StrippingLine import StrippingLine from StrippingUtils.Utils import LineBuilder diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py index 76ad4b5dd..b59d48fb8 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py @@ -419,7 +419,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi, RequiredSelections=[self.Muons]) @@ -436,7 +435,6 @@ class B23MuNuConf(LineBuilder): CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"], MotherCut="ALL") - from PhysSelPython.Wrappers import Selection SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi, RequiredSelections=[self.Electrons]) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py index bf18b6074..94a83f33e 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py @@ -105,7 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py index 8fc20aaf9..e74c7de20 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py @@ -135,7 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py index 7ce8d0135..f46738721 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py @@ -130,7 +130,6 @@ class bhad2PMuXBuilder(LineBuilder): def __init__(self, name, config): LineBuilder.__init__(self, name, config) - self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config, "Preambulo": ["from LoKiTracks.decorators import *"]} -- GitLab From 3efd221a2eef16be407fdaaf15f97094021b3fb8 Mon Sep 17 00:00:00 2001 From: erodrigu <eduardo.rodrigues@cern.ch> Date: Fri, 31 Mar 2023 20:04:47 +0200 Subject: [PATCH 8/8] Flake8 - ignore also E203,E266,W191,W291 for now, since hugely common --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8658bdc6c..f93cadb64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,5 +21,4 @@ python-linting: script: - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh # Only run the pyflakes linter and a few select pycodestyle errors, ignore line too long warnings. - - flake8 --extend-ignore E501,F405 $(find . -name '*.py') - + - flake8 --extend-ignore E203,E266,E501,F405,W191,W291 $(find . -name '*.py') -- GitLab