diff --git a/DaVinciSys/tests/options/DVTestInitialise.py b/DaVinciSys/tests/options/DVTestInitialise.py
index d4fbd2678fe83940a2a6066623b2b508086a69d6..be14094e8d946f422579be86e264d4cc6e9c93cc 100755
--- a/DaVinciSys/tests/options/DVTestInitialise.py
+++ b/DaVinciSys/tests/options/DVTestInitialise.py
@@ -8,12 +8,8 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-## $Id: DVTestInitialise.py,v 1.4 2010-02-23 10:33:21 jpalac Exp $
-## ============================================================================
-## CVS tag $Name: not supported by cvs2svn $
-## ============================================================================
"""
-@file $Name: not supported by cvs2svn $
+@file DVTestInitialise.py
Test for DaVinci initialisation
@@ -23,13 +19,12 @@ Test for DaVinci initialisation
from Gaudi.Configuration import *
from Configurables import DaVinci
DaVinci().MainOptions = ""
-DaVinci().UserAlgorithms = [ ]
+DaVinci().UserAlgorithms = []
-DaVinci().EvtMax = 0 # No running
-DaVinci().SkipEvents = 0
-DaVinci().PrintFreq = 1
+DaVinci().EvtMax = 0 # No running
+DaVinci().SkipEvents = 0
+DaVinci().PrintFreq = 1
DaVinci().DataType = 'Upgrade'
DaVinci().Lumi = True
########################################################################
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-
diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
index c67f93873e5d8742e57263e226f9553f0d69ae48..04c3cb091a0ee81b803c3c35d23d2d246be3b93f 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
@@ -8,8 +8,6 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-##############################################################################
-# $Id: DVTestCommonParticles.py,v 1.3 2010/01/06 08:51:50 pkoppenb Exp $
#
# syntax: gaudirun.py $DAVINCIMONITORSROOT/options/DVMonitorDst.py
#
@@ -25,12 +23,12 @@ from CommonParticles import StandardBasic
from CommonParticles import StandardIntermediate
Locations = []
-for a,b in StandardIntermediate.locations.items():
+for a, b in StandardIntermediate.locations.items():
print("DVTestCommonParticles adding location", a)
Locations.append(a)
from Configurables import CountParticles
-CP = CountParticles(Inputs = Locations)
+CP = CountParticles(Inputs=Locations)
##############################################################################
#
# Histograms
@@ -43,13 +41,13 @@ DaVinci().HistogramFile = "DVStandardIntermediate.root"
##############################################################################
from Configurables import CondDB
-DaVinci().UserAlgorithms = [ CP ] # count them all
+DaVinci().UserAlgorithms = [CP] # count them all
DaVinci().EvtMax = 500
-DaVinci().DataType = "Upgrade" # Must be given
+DaVinci().DataType = "Upgrade" # Must be given
DaVinci().Simulation = True
DaVinci().InputType = 'LDST'
DaVinci().Lumi = False
-CondDB().Upgrade = True
+CondDB().Upgrade = True
DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
diff --git a/DaVinciTests/tests/options/DVTestInitialise.py b/DaVinciTests/tests/options/DVTestInitialise.py
index c4a5e23aaeded81b26e7cbe86955f1221b9904c1..665ea3d07e3429890c46793e33c8bf6896f346ab 100755
--- a/DaVinciTests/tests/options/DVTestInitialise.py
+++ b/DaVinciTests/tests/options/DVTestInitialise.py
@@ -8,12 +8,8 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-## $Id: DVTestInitialise.py,v 1.4 2010/02/23 10:33:21 jpalac Exp $
-## ============================================================================
-## CVS tag $Name: $
-## ============================================================================
"""
-@file $Name: $
+@file DVTestInitialise.py
Test for DaVinci initialisation
@@ -24,15 +20,14 @@ from Gaudi.Configuration import *
from Configurables import DaVinci
DaVinci().MainOptions = ""
-DaVinci().UserAlgorithms = [ ]
+DaVinci().UserAlgorithms = []
-DaVinci().EvtMax = 0 # No running
-DaVinci().SkipEvents = 0
-DaVinci().PrintFreq = 1
+DaVinci().EvtMax = 0 # No running
+DaVinci().SkipEvents = 0
+DaVinci().PrintFreq = 1
DaVinci().DataType = 'Upgrade'
DaVinci().Simulation = False
DaVinci().Lumi = True
########################################################################
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-
diff --git a/DaVinciTests/tests/options/DVTestReadDst.py b/DaVinciTests/tests/options/DVTestReadDst.py
index 74d231cf3030144e7494cff4d2f4cd120b806412..6cea2e5670491053268e1aaf01af3028414d23c6 100755
--- a/DaVinciTests/tests/options/DVTestReadDst.py
+++ b/DaVinciTests/tests/options/DVTestReadDst.py
@@ -8,9 +8,6 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-########################################################################
-#
-# $Id: DVTestReadDst.py,v 1.11 2009/11/30 10:57:40 jpalac Exp $
#
# Options for a typical DaVinci job reading DSTs with saved candidates.
#
@@ -25,33 +22,32 @@ from Configurables import DaVinci
# Print the J/psis
#
from Configurables import PrintDecayTree, PrintHeader, FilterDesktop
-DaVinci().UserAlgorithms = [ PrintHeader() ]
-MassRanges = [ [ 3000, 3087 ], [ 3088, 3100 ], [ 3100, 4000 ] ]
-for i in MassRanges :
+DaVinci().UserAlgorithms = [PrintHeader()]
+MassRanges = [[3000, 3087], [3088, 3100], [3100, 4000]]
+for i in MassRanges:
ln = str(i[0])
hn = str(i[1])
- name = ln+"_"+hn
+ name = ln + "_" + hn
location = "/Event/SeqJpsi_" + name + "/Phys/SelJpsi_" + name
- pJpsi = PrintDecayTree('PrintJpsi_'+name,
- Inputs = [ location ])
- DaVinci().UserAlgorithms += [ pJpsi ]
- f = FilterDesktop('Filter_'+name,
- Inputs = [ location ],
- Code = "(MIPCHI2DV(PRIMARY) > 2)")
- DaVinci().UserAlgorithms += [ f ]
-
+ pJpsi = PrintDecayTree('PrintJpsi_' + name, Inputs=[location])
+ DaVinci().UserAlgorithms += [pJpsi]
+ f = FilterDesktop(
+ 'Filter_' + name, Inputs=[location], Code="(MIPCHI2DV(PRIMARY) > 2)")
+ DaVinci().UserAlgorithms += [f]
+
##############################################################################
#
#
##############################################################################
DaVinci().EvtMax = -1
-DaVinci().PrintFreq = 1
+DaVinci().PrintFreq = 1
DaVinci().DataType = "2010"
DaVinci().Simulation = True
-DaVinci().Input = [ "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3088_3100.dst' TYP='POOL_ROOTTREE' OPT='READ'"
- , "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3100_4000.dst' TYP='POOL_ROOTTREE' OPT='READ'"
- , "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3000_3087.dst' TYP='POOL_ROOTTREE' OPT='READ'"
- ]
+DaVinci().Input = [
+ "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3088_3100.dst' TYP='POOL_ROOTTREE' OPT='READ'",
+ "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3100_4000.dst' TYP='POOL_ROOTTREE' OPT='READ'",
+ "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3000_3087.dst' TYP='POOL_ROOTTREE' OPT='READ'"
+]
########################################################################
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/DVTestWriteDst.py b/DaVinciTests/tests/options/DVTestWriteDst.py
index 6fe1e2343ae6f511af3e0a86e2b52848619afad7..d15089297d0ad05355c49ab78f8a09f1a52fe1db 100755
--- a/DaVinciTests/tests/options/DVTestWriteDst.py
+++ b/DaVinciTests/tests/options/DVTestWriteDst.py
@@ -8,9 +8,6 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-########################################################################
-#
-# $Id: DVTestWriteDst.py,v 1.11 2010/05/25 11:04:28 jpalac Exp $
#
# Options for a DaVinci job creating DSTs
#
@@ -34,62 +31,63 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand, SelectionSequence
from DSTWriters.Configuration import SelDSTWriter
from DSTWriters.microdstelements import CloneParticleMCInfo
-MyLooseJpsi = DataOnDemand(Location = 'Phys/StdLooseJpsi2MuMu/Particles')
+MyLooseJpsi = DataOnDemand(Location='Phys/StdLooseJpsi2MuMu/Particles')
#
# Loop over three overlapping mass zones
#
-MassRanges = [ [ 3000, 3087 ], [ 3088, 3100 ], [ 3100, 4000 ] ]
+MassRanges = [[3000, 3087], [3088, 3100], [3100, 4000]]
selections = []
-for i in MassRanges :
+for i in MassRanges:
lm = i[0]
hm = i[1]
ln = str(lm)
hn = str(hm)
- name = ln+"_"+hn
+ name = ln + "_" + hn
# define the prescale to have a constant (assumed flat) level of background
- prescale = DeterministicPrescaler("Prescale_"+name,
- SeedName="Prescale_"+name,
- AcceptFraction = 100./(hm-lm))
- filter = FilterDesktop("Jpsi_"+name,
- Code = "(MM>"+ln+") & (MM<"+hn+") & (MIPCHI2DV(PRIMARY) > 2)")
-
- SelJpsi = Selection('SelJpsi_'+name,
- Algorithm = filter,
- RequiredSelections = [ MyLooseJpsi ])
-
- printer = PrintDecayTree("Print_"+name,
- Input = SelJpsi.outputLocation())
-
- SeqJpsi = SelectionSequence('SeqJpsi_'+name
- , TopSelection = SelJpsi
- , EventPreSelector = [ prescale ]
- , PostSelectionAlgs = [ printer ])
+ prescale = DeterministicPrescaler(
+ "Prescale_" + name,
+ SeedName="Prescale_" + name,
+ AcceptFraction=100. / (hm - lm))
+ filter = FilterDesktop(
+ "Jpsi_" + name,
+ Code="(MM>" + ln + ") & (MM<" + hn + ") & (MIPCHI2DV(PRIMARY) > 2)")
+
+ SelJpsi = Selection(
+ 'SelJpsi_' + name, Algorithm=filter, RequiredSelections=[MyLooseJpsi])
+
+ printer = PrintDecayTree("Print_" + name, Input=SelJpsi.outputLocation())
+
+ SeqJpsi = SelectionSequence(
+ 'SeqJpsi_' + name,
+ TopSelection=SelJpsi,
+ EventPreSelector=[prescale],
+ PostSelectionAlgs=[printer])
selections += [SeqJpsi]
-
-dstWriter = SelDSTWriter("JpsiDSTWriter_"+name,
- SelectionSequences = selections)
+
+dstWriter = SelDSTWriter(
+ "JpsiDSTWriter_" + name, SelectionSequences=selections)
dstWriter.MicroDSTElements['default'] += [CloneParticleMCInfo()]
seq = dstWriter.sequence()
-DaVinci().UserAlgorithms = [ seq ]
+DaVinci().UserAlgorithms = [seq]
##############################################################################
from Configurables import CondDB
DaVinci().EvtMax = 1000
-DaVinci().PrintFreq = 100
+DaVinci().PrintFreq = 100
# DaVinci().SkipEvents = 0
-DaVinci().DataType = "Upgrade"
+DaVinci().DataType = "Upgrade"
DaVinci().Simulation = True
DaVinci().InputType = 'LDST'
DaVinci().Lumi = False
-CondDB().Upgrade = True
+CondDB().Upgrade = True
DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
########################################################################
@@ -97,7 +95,7 @@ MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
##############################################################################
#-- GAUDI jobOptions generated on Mon Jan 17 17:13:58 2011
-#-- Contains event types :
+#-- Contains event types :
#-- 13144006 - 1 files - 10000 events - 4.13 GBytes
# MC 2010 Beam3500GeV-VeloClosed-MagDown-Nu3
# bs->Jpsi, Phi
diff --git a/DaVinciTests/tests/options/SimpleMuSelection.py b/DaVinciTests/tests/options/SimpleMuSelection.py
index 8bf2ec6e2fa7f186f7023a1cc726e035d54b5f2a..4985d2a40e8f1d787b64e502ec1ea969bf471d41 100644
--- a/DaVinciTests/tests/options/SimpleMuSelection.py
+++ b/DaVinciTests/tests/options/SimpleMuSelection.py
@@ -17,7 +17,6 @@
__author__ = 'R. Lambert'
__date__ = 'November 2009'
-__version__ = '$Revision: 1.3 $'
import GaudiKernel.SystemOfUnits as Units
from Gaudi.Configuration import *
@@ -28,16 +27,14 @@ from StandardParticles import StdLooseMuons as MyStdMuons
MuForTests = FilterDesktop("_bachelorMu")
MuForTests.Code = "((ISLONG) & (PT > 250.*MeV))"
-
-
-SelMuForTests = Selection("BachelorMuForTests",
- Algorithm=MuForTests,
- RequiredSelections = [MyStdMuons])
+SelMuForTests = Selection(
+ "BachelorMuForTests",
+ Algorithm=MuForTests,
+ RequiredSelections=[MyStdMuons])
from Configurables import CheckPV
checkPV = CheckPV('TestCheckPV')
-TestSequence = SelectionSequence("TestSeq",
- TopSelection = SelMuForTests,
- EventPreSelector = [checkPV])
+TestSequence = SelectionSequence(
+ "TestSeq", TopSelection=SelMuForTests, EventPreSelector=[checkPV])
-dv=DaVinci()
-DaVinci().UserAlgorithms=[ TestSequence.sequence() ]
+dv = DaVinci()
+DaVinci().UserAlgorithms = [TestSequence.sequence()]