Skip to content
Snippets Groups Projects
Commit bee707a1 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

v11r6p1

parent 979315a9
No related branches found
No related tags found
No related merge requests found
# =============================================================================
package CaloReco
version v5r11
version v5r12
# ================ structure ==================================================
branches cmt doc src options
......
v5r11
v5r12
......@@ -4,6 +4,15 @@
! Purpose : Main Package for Calorimeter Reconstruction Software
! -----------------------------------------------------------------------------
!========================= CaloReco v5r12 2011-08-29 =========================
! 2011-08-27 - Olivier Deschamps
- fix tracks list reset in CaloProcessor.XXSequence when called from CaloLines
- python/Configuration.py : remove dependency on GlobalRecoConf (was producing loop in configurable).
TrackTypes & TrackCuts is now private property with the same default
as in GlobalRecoConf so far
!========================= CaloReco v5r11 2011-07-27 =========================
! 2011-07-27 - Marco Cattaneo
- Protect unprotected MSG::DEBUG, also using UNLIKELY macro
......
......@@ -38,7 +38,7 @@ from Reconstruction import ( clusterReco ,
from Configurables import CaloDigitConf
from Configurables import CaloPIDsConf
from Configurables import GlobalRecoConf
##from Configurables import GlobalRecoConf
from Configurables import GaudiSequencer
......@@ -406,6 +406,12 @@ class CaloProcessor( CaloRecoConf ):
'ProtoSequencer' : None,
'NeutralProtoSequencer' : None,
'ChargedProtoSequencer' : None,
## PRIVATE TrackTypes & TrackCuts property (as in GlobalRecoConf) : for ChargedProto creation OnD.
"TrackTypes" : [ "Long", "Upstream", "Downstream" ],
"TrackCuts" : { "Long" : { "Chi2Cut" : [0,10] }
,"Upstream" : { "Chi2Cut" : [0,10] }
,"Downstream" : { "Chi2Cut" : [0,10] } },
##
'DataType' : 'MC09',
'PIDList' : ['InAcceptance',
'Match',
......@@ -419,8 +425,7 @@ class CaloProcessor( CaloRecoConf ):
## used configurables
__used_configurables__ = (
(CaloPIDsConf,None ),
(CaloDigitConf,None ),
(GlobalRecoConf,None)
(CaloDigitConf,None )
)
......@@ -464,7 +469,8 @@ class CaloProcessor( CaloRecoConf ):
context = self.getProp('Context')
if context == '' :
self.setProp("Context", self.getName() )
self.setProp("TrackLocations", tracks)
if tracks != [] :
self.setProp("TrackLocations", tracks)
self.applyConf()
return seq
def protoSequence ( self, tracks=[] , protoPrefix = '' ) :
......@@ -473,7 +479,8 @@ class CaloProcessor( CaloRecoConf ):
self.setProp("ProtoSequencer", seq)
if self.getProp('Context') == '' :
self.setProp("Context", self.getName() )
self.setProp("TrackLocations", tracks)
if tracks != [] :
self.setProp("TrackLocations", tracks)
if protoPrefix != '' :
nloc = protoPrefix + '/Neutrals'
cloc = protoPrefix + '/Charged'
......@@ -489,7 +496,8 @@ class CaloProcessor( CaloRecoConf ):
self.setProp("ChargedProtoSequencer", seq)
if self.getProp('Context') == '' :
self.setProp("Context", self.getName() )
self.setProp("TrackLocations", tracks)
if tracks != [] :
self.setProp("TrackLocations", tracks)
if protoPrefix != '' :
cloc = protoPrefix
if protoPrefix.find('/Charged') == -1 :
......@@ -504,7 +512,8 @@ class CaloProcessor( CaloRecoConf ):
self.setProp("NeutralProtoSequencer", seq)
if self.getProp('Context') == '' :
self.setProp("Context", self.getName() )
self.setProp("TrackLocations", tracks)
if tracks != [] :
self.setProp("TrackLocations", tracks)
if protoPrefix != '' :
nloc = protoPrefix
if protoPrefix.find('/Neutrals') == -1 :
......@@ -519,7 +528,8 @@ class CaloProcessor( CaloRecoConf ):
self.setProp("Sequence", seq)
if self.getProp('Context') == '' :
self.setProp("Context", self.getName() )
self.setProp("TrackLocations", tracks)
if tracks != [] :
self.setProp("TrackLocations", tracks)
if protoPrefix != '' :
nloc = protoPrefix + '/Neutrals'
cloc = protoPrefix + '/Charged'
......@@ -659,9 +669,13 @@ class CaloProcessor( CaloRecoConf ):
maker = getAlgo( ChargedProtoParticleMaker, "ChargedProtoMaker" , context, cloc , pdod )
# protoPMaker settings (from GlobalRecoConf)
from Configurables import DelegatingTrackSelector,GaudiSequencer
ppConf = GlobalRecoConf('DummyConf',RecoSequencer=GaudiSequencer('DummySeq'))
ttypes = ppConf.getProp('TrackTypes')
tcuts = ppConf.getProp('TrackCuts')
## ppConf = GlobalRecoConf('DummyConf',RecoSequencer=GaudiSequencer('DummySeq'))
##ttypes = ppConf.getProp('TrackTypes')
##tcuts = ppConf.getProp('TrackCuts')
ttypes = self.getProp('TrackTypes')
tcuts = self.getProp('TrackCuts')
maker.addTool( DelegatingTrackSelector, name="TrackSelector" )
maker.TrackSelector.TrackTypes = ttypes
from Configurables import TrackSelector
......@@ -669,9 +683,8 @@ class CaloProcessor( CaloRecoConf ):
maker.TrackSelector.addTool(TrackSelector,name=type)
ts = getattr(maker.TrackSelector,type)
ts.TrackTypes = [type]
cuts = ppConf.getProp("TrackCuts")
if type in cuts :
for name,cut in cuts[type].iteritems() :
if type in tcuts :
for name,cut in tcuts[type].iteritems() :
ts.setProp("Min"+name,cut[0])
ts.setProp("Max"+name,cut[1])
#########################################
......
package RecSys
version v11r6
version v11r6p1
branches cmt doc tests
......@@ -10,7 +10,7 @@ branches cmt doc tests
# Calorimeter # Maintainer
use CaloMoniDst v5r8 Calo # Olivier Deschamps
use CaloPIDs v5r9 Calo # Victor Egorychev, Vanya Belyaev
use CaloReco v5r11 Calo # Olivier Deschamps
use CaloReco v5r12 Calo # Olivier Deschamps
# Hlt
use HltMonitors v1r4 Hlt # Roel Aaij
......
v11r6
v11r6p1
......@@ -5,15 +5,26 @@ Purpose: LHCb reconstruction packages.
This project groups together all the reconstruction packages needed
by one or more LHCb applications.
</PRE><H1><A NAME=v11r6p1>2013-04-19 RecSys v11r6p1</A></H1><PRE>
Branch for swimming stripping20 data. See task #40023.
On top of LHCb v32r5p1, patch stack just for swimming purposes.
Updated Package:
- Calo/CaloReco only, as used in Moore v12r9 anyway, simply absorbing it in lower down for simplicity.
For more information see https://lhcb-tag-collector.web.cern.ch/lhcb-tag-collector/display.html?project=Rec&version=v11r6p1
</PRE><H1><A NAME=v11r6>2011-07-27 RecSys v11r6</A></H1><PRE>
This version uses Gaudi v22r2 and LHCb v32r5
- Production release for 2011 August data,
- Production release for 2011 August data,
developments for 2011 MC and end of year reprocessing
- Packages updated: CaloMoniDst v5r8, CaloReco v5r11, HltMonitors v1r4,
MuonID v9r0p2, MuonTrackMonitor v2r3, ChargedProtoANNPID v1r5,
GlobalReco v6r38, LumiAlgs v6r1, RecAlgs v2r5, RecConf v2r2,
GlobalReco v6r38, LumiAlgs v6r1, RecAlgs v2r5, RecConf v2r2,
RichAlignment v1r4, RichENNRingFinder v1r3, RichGlobalPID v3r16,
RichHPDImageAnalysis v1r8, RichRecQC v2r53, RichRecStereoTools v1r8,
RichRecSys v4r3, RichRecTrackTools v1r30, PatAlgorithms v4r14,
......@@ -49,7 +60,7 @@ This version uses Gaudi v22r2 and LHCb v32r5
- In Rec/RecAlgs v2r5
. Add "Hlt" to the list of sub-systems ProcStatAbortMoni knows about
- In Rec/RecConf v2r2
- In Rec/RecConf v2r2
. Propagate "Simulation" flag to RichRecQCConf Configurable.
- In Rich/RichAlignment v1r4, Rich/RichHPDImageAnalysis v1r8
......@@ -130,7 +141,7 @@ This version uses Gaudi v22r2 and LHCb v32r5
. TrackVertexMonitor: introduce cutoff for IP profiles to be more sensitive
to mean
- In Velo/VeloRecMonitors v2r14
- In Velo/VeloRecMonitors v2r14
. Fixed integer division bug in new occpancy vs. BCID code
. Re-implementation of occupancy per bunch crossing ID in
VeloOccupancyMonitor: much cleaner code and fixes a bug that caused these
......@@ -143,7 +154,7 @@ This version uses Gaudi v22r2 and LHCb v32r5
Rich/RichRecStereoTools v1r8, Rich/RichRecTrackTools v1r30,
Tf/PatAlgorithms v4r14, Tf/TfTools v1r15, Tr/TrackExtrapolators v2r31,
Tr/TrackMonitors v1r33, Tr/TrackTools v4r7, Tr/TrackUtils v1r43,
Velo/VeloRecMonitors v2r14
Velo/VeloRecMonitors v2r14
. Create debug(), verbose() messages only when output level requires it
- In Calo/CaloMoniDst v5r8, Muon/MuonTrackMonitor v2r3, Tf/PatAlgorithms v4r14,
......@@ -177,11 +188,11 @@ This version uses Gaudi v22r2 and LHCb v32r3
- This is a development version of Rec, for use with 2011 data.
- Modified packages: CaloPIDs v5r9, CaloReco v5r9, MuonID v8r1,
- Modified packages: CaloPIDs v5r9, CaloReco v5r9, MuonID v8r1,
MuonTrackMonitor v2r2, MuonTrackRec v3r5, GlobalReco v6r37, LumiAlgs v5r1,
RecoUpgrade v2r2, RecoUpgradeMC v1r3, RichAlignment v1r3,
RichHPDImageAnalysis v1r7, RichParticleSearch v1r1, RichRecQC v2r50,
RichRecTools v4r16, RichRecTrackTools v1r28, TrackFitEvent v5r9,
RichRecTools v4r16, RichRecTrackTools v1r28, TrackFitEvent v5r9,
TrackTools v4r5
- In CaloPIDs v5r9
......@@ -273,7 +284,7 @@ This version uses Gaudi v22r1 and LHCb v32r2
which was duplicated 5 times or so in the code.
. Move 0-protection check to 1e-30 and ensure consistency
. Fixed debug printout, only prepare string if debug is required.
. Fixed bug in MuonIDAlg:
. Fixed bug in MuonIDAlg:
Null ProbMu and ProbNonMu in method calcMuonLL_tanhdist_landau
Change to low value to avoid log(ProbMu) and log(ProbNonMu) divergence.
. Move WARNING message during initialize to INFO
......@@ -369,8 +380,8 @@ This version uses Gaudi v22r1 and LHCb v32r1p1
- The L0TCK major version has increased requiring a
L0DU (Lbcom) and Rec/LumiAlgs v5r0p1 patch
- The RecHeader now also holds for each event a string of the
raw file GUID, required before we can use conditions to
- The RecHeader now also holds for each event a string of the
raw file GUID, required before we can use conditions to
perform DQ checks, This is filled by RecInit in Rec/RecAlgs v2r2
- Minor changes were also made to Tr/TrackMonitors v3r31
......@@ -392,15 +403,15 @@ Highlights:
- Tr/TrackTools, roll back of error parameterisation to DC06 settings
new MC10 parameterisation is under study
- Tr/TrackSys, make 2011 the default datatype
- Rec/LumiAlgs,
. move database access to a tool, "GetLumiParameters"
- Rec/LumiAlgs,
. move database access to a tool, "GetLumiParameters"
used by LumiIntegrateFSR, LumiCheckCondDB
. add usage of online partition for LHC parameters (filling scheme) and TCK
dependent parameters (e.g. rate limiters)
. update unit tests using new pinned input files
. update requirements file to enable TCK and online partition
Otherwise many minor cosmetic changes, including the start of the campaign to
Otherwise many minor cosmetic changes, including the start of the campaign to
suppress the many icc warnings, remarks, and coverity defects in Rec.
For more details, links to changesets and bugs, see:
......@@ -456,7 +467,7 @@ https://lhcb-tag-collector.web.cern.ch/lhcb-tag-collector/display.html?project=R
</PRE><H1><A NAME=v10r6>2010-12-16 RecSys v10r6</A></H1><PRE>
This version uses Gaudi v21r11 and LHCb v31r8
- Development releases for 2011.
- Development releases for 2011.
- Many changes in underlying packages, new LHCb version
- Retire the package Rich/RichMarkovRingFinder
......
project REC
use LHCB LHCB_v32r5
use LHCB LHCB_v32r5p1
build_strategy with_installarea
setup_strategy root
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment