diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32db2e82d435b54753af87073f5baf0f30daef79..d352d45fc11fd3ed4c1be35d48dd2e3799295609 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,9 @@ find_package(GaudiProject)
#---------------------------------------------------------------
# Declare project name and version
-gaudi_project(DaVinci v42r6p1
- USE Analysis v18r5p1
- Stripping v11r3p1
+gaudi_project(DaVinci v43r1
+ USE Analysis v19r1
+ Stripping v11r4
DATA AppConfig VERSION v3r*
FieldMap VERSION v5r*
ParamFiles VERSION v8r*
diff --git a/Phys/DaVinci/doc/release.notes b/Phys/DaVinci/doc/release.notes
index 9626be3c8e006b9c6ce86b59ac1b9de045e6be40..9974a11f0e3cf56e74a2403fe79e1a59fdd52e16 100755
--- a/Phys/DaVinci/doc/release.notes
+++ b/Phys/DaVinci/doc/release.notes
@@ -8,6 +8,11 @@
!
!-----------------------------------------------------------------------------
+! 2017-11-07 - Vanya Belyaev
+ - DaVinci
+ - Set "CondDB ( Upgdade = True)" for DataType='Upgrade'
+
+
! 2017-01-12 - Vanya Belyaev
- DaVinci:
issue warning message if DDDBtag/CondDBtag are not specified for simulated data
diff --git a/Phys/DaVinci/python/DaVinci/Configuration.py b/Phys/DaVinci/python/DaVinci/Configuration.py
index 8e3301c988f73ded7224a40501d8bdde1c727541..ec894754aa3bdf6e44ccc9929a46e46e03918426 100644
--- a/Phys/DaVinci/python/DaVinci/Configuration.py
+++ b/Phys/DaVinci/python/DaVinci/Configuration.py
@@ -555,6 +555,21 @@ class DaVinci(LHCbConfigurableUser) :
log.info("Creating Moni Algorithms")
self.appendToMoniSequence( self.getProp("MoniSequence") )
+ ## Specific action for DataType='Upgrade'
+ def _upgradeAction ( self ) :
+ """ Define specific action for DataType='Upgrade'
+ """
+
+ if self.getProp('DataType').upper() == 'UPGRADE' :
+ from Configurables import CondDB
+ _db = CondDB()
+ if _db.isPropertySet('Upgrade') :
+ if not _db.getProp('Upgrade') :
+ log.warning('Inconsistent configuration: CondDB ( Upgrade = False ) is set explicitely')
+ else :
+ log.info ('Define CondDB( Upgrade = True ) ')
+ _db.Upgrade = True
+
################################################################################
# Append to Moni sequence
#
@@ -581,7 +596,8 @@ class DaVinci(LHCbConfigurableUser) :
'SDST' : 1 }
inputType = self.getProp('InputType').upper()
IODataManager().setProp('AgeLimit', depthMap.get(inputType, 0))
-
+
+
################################################################################
# Apply configuration
#
@@ -625,6 +641,7 @@ class DaVinci(LHCbConfigurableUser) :
self._defineEvents()
self._defineInput()
self._rootFiles()
+ self._upgradeAction()
# Add main sequence to TopAlg
self._mainSequence ()
diff --git a/Phys/KaliCalo/src/Cloner.cpp b/Phys/KaliCalo/src/Cloner.cpp
index 8066dc884e4febc42ba822b914f463e1bfca02a9..68b681bec638e84a2e0c79202916f9a56441ee2e 100644
--- a/Phys/KaliCalo/src/Cloner.cpp
+++ b/Phys/KaliCalo/src/Cloner.cpp
@@ -1,4 +1,3 @@
-// $Id: $
// ============================================================================
// Include files
// ============================================================================
@@ -12,10 +11,6 @@
* @see Kali::Destroyer
* @author Vanya BELYAEV Ivan.Belyaev@cern.ch
* @date 2011-07-31
- *
- * $Revision$
- * Last modification $Date$
- * by $Author$
*/
// ============================================================================
namespace Kali
@@ -24,11 +19,7 @@ namespace Kali
/** @class cloner
*
* @author Vanya BELYAEV Ivan.Belyaev@itep.ru
- * @date 2011-07-31
- *
- * $Revision$
- * Last modification $Date$
- * by $Author$
+ * @date 2011-07-31
*/
class Cloner : public Kali::Destroyer
{
@@ -81,7 +72,7 @@ StatusCode Kali::Cloner::execute ()
StatusCode sc = collect ( digits , tracks ) ;
if ( sc.isFailure() )
{
- Warning ("Error from collect", sc ) ;
+ Warning ("Error from collect", sc ).ignore() ;
setFilterPassed ( false ) ;
return StatusCode::SUCCESS ;
}
@@ -92,7 +83,7 @@ StatusCode Kali::Cloner::execute ()
sc = copy ( digits , tracks ) ;
if ( sc.isFailure() )
{
- Warning ("Error from destroy", sc ) ;
+ Warning ("Error from destroy", sc ).ignore() ;
setFilterPassed ( false ) ;
return StatusCode::SUCCESS ;
}
diff --git a/Phys/KaliCalo/src/DataMove.cpp b/Phys/KaliCalo/src/DataMove.cpp
index 4caac20aca3c2b5cdfb571e1bbb54136c5bbeeb3..4f42dd36e563cf32b9bae3a04ab43d9d9286a154 100644
--- a/Phys/KaliCalo/src/DataMove.cpp
+++ b/Phys/KaliCalo/src/DataMove.cpp
@@ -1,4 +1,3 @@
-// $Id: $
// ============================================================================
// Include files
// ============================================================================
@@ -30,10 +29,6 @@ namespace Kali
*
* @author Vanya BELYAEV Ivan.Belyaev@itep.ru
* @date 2011-07-31
- *
- * $Revision$
- * Last modification $Date$
- * by $Author$
*/
class DataMove : public GaudiAlgorithm
{
@@ -106,7 +101,7 @@ StatusCode Kali::DataMove::execute()
//
if ( !exist<DataObject>( loc ) )
{
- Warning ( "Location does not exist: '" + loc + "'" , StatusCode::SUCCESS , 2 ) ;
+ Warning ( "Location does not exist: '" + loc + "'" , StatusCode::SUCCESS , 2 ).ignore() ;
continue ; // CONTINUE
}
//
@@ -115,7 +110,7 @@ StatusCode Kali::DataMove::execute()
StatusCode sc = evtSvc()->unregisterObject ( obj ) ;
if ( sc.isFailure() )
{
- Error ( "Unable unregister '" + loc + "'" , sc ) ;
+ Error ( "Unable unregister '" + loc + "'" , sc ).ignore() ;
continue ; // CONTINUE
}
// register it at "standard" location
diff --git a/Phys/KaliCalo/src/Destroyer.cpp b/Phys/KaliCalo/src/Destroyer.cpp
index 64e757507f97ac92c8fa994446e9408dc414a1c4..877cd68d54130e990e4645a4decbc0846a84e96a 100644
--- a/Phys/KaliCalo/src/Destroyer.cpp
+++ b/Phys/KaliCalo/src/Destroyer.cpp
@@ -1,4 +1,3 @@
-// $Id$
// ============================================================================
// Include files
// ============================================================================
@@ -27,11 +26,6 @@
*
* @see Kali::Destroyer
* @author Vanya BELYAEV Ivan.Belyaev@cern.ch
- * @date xxxx-xx-xx
- *
- * $Revision$
- * Last modification $Date$
- * by $Author$
*/
// ============================================================================
// Update handler for the property
@@ -41,9 +35,9 @@ void Kali::Destroyer::updateDestroy ( Property& /* p */ )
if ( FSMState() < Gaudi::StateMachine::INITIALIZED ) { return ; } // RETURN
//
if ( m_destroy )
- { Warning ( "TES containers will be destroyed!" , StatusCode::SUCCESS ) ; }
+ { Warning ( "TES containers will be destroyed!" , StatusCode::SUCCESS ).ignore() ; }
else
- { Warning ( "TES containers will be preserved!" , StatusCode::SUCCESS ) ; }
+ { Warning ( "TES containers will be preserved!" , StatusCode::SUCCESS ).ignore() ; }
//
}
// ============================================================================
@@ -104,7 +98,7 @@ StatusCode Kali::Destroyer::collect
particles.insert ( particles.end() , p.begin() , p.end() ) ;
}
else { Warning ( "Invalid Location for Particles: " + (*iparticle) ,
- StatusCode::SUCCESS ) ; }
+ StatusCode::SUCCESS ).ignore() ; }
}
// ==========================================================================
@@ -470,7 +464,7 @@ StatusCode Kali::Destroyer::execute ()
StatusCode sc = collect ( digits , tracks ) ;
if ( sc.isFailure() )
{
- Warning ("Error from collect", sc ) ;
+ Warning ("Error from collect", sc ).ignore() ;
setFilterPassed ( false ) ;
return StatusCode::SUCCESS ;
}
@@ -481,7 +475,7 @@ StatusCode Kali::Destroyer::execute ()
sc = destroy ( digits , tracks ) ;
if ( sc.isFailure() )
{
- Warning ("Error from destroy", sc ) ;
+ Warning ("Error from destroy", sc ).ignore() ;
setFilterPassed ( false ) ;
return StatusCode::SUCCESS ;
}
diff --git a/Phys/KaliCalo/src/Pi0.cpp b/Phys/KaliCalo/src/Pi0.cpp
index db18f505a17e61e1709c8286bd47a20ef46db489..84a84e3418306cdeab915733e4908f9c95066785 100755
--- a/Phys/KaliCalo/src/Pi0.cpp
+++ b/Phys/KaliCalo/src/Pi0.cpp
@@ -1,4 +1,3 @@
-// $Id$
// ============================================================================
// Include files
// ============================================================================
@@ -58,10 +57,6 @@ namespace Kali
*
* @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
* @date 2009-09-28
- *
- * $Revision$
- * Last modification $Date$
- * by $Author$
*/
class Pi0 : public LoKi::Algo
{
@@ -245,9 +240,9 @@ void Kali::Pi0::mirrorHandler ( Property& /* p */ )
if ( Gaudi::StateMachine::INITIALIZED > FSMState() ) { return ; }
//
if ( m_mirror )
- { Warning ( "Albert's trick for background evaluation is activated!", StatusCode::SUCCESS ) ; }
+ { Warning ( "Albert's trick for background evaluation is activated!", StatusCode::SUCCESS ).ignore() ; }
else
- { Warning ( "Albert's trick for background evaluation is deactivated!", StatusCode::SUCCESS ) ; }
+ { Warning ( "Albert's trick for background evaluation is deactivated!", StatusCode::SUCCESS ).ignore() ; }
//
}
// ============================================================================
@@ -281,7 +276,7 @@ void Kali::Pi0::setupHistos ()
if ( produceHistos() )
{
- Warning ( "Monitoring histograms are activated" , StatusCode::SUCCESS ) ;
+ Warning ( "Monitoring histograms are activated" , StatusCode::SUCCESS ).ignore() ;
if ( 0 == m_h1 ) { m_h1 = book ( "mpi0" , 0 , 250 * MeV , 250 ) ; }
if ( 0 == m_h2 ) { m_h2 = book ( "mpi0-Prs_ll_10_MeV" , 0 , 250 * MeV , 250 ) ; }
if ( 0 == m_h3 ) { m_h3 = book ( "mpi0-Prs_lg_10_MeV" , 0 , 250 * MeV , 250 ) ; }
@@ -289,7 +284,7 @@ void Kali::Pi0::setupHistos ()
}
else
{
- Warning ( "Monitoring histograms are deactivated!", StatusCode::SUCCESS ) ;
+ Warning ( "Monitoring histograms are deactivated!", StatusCode::SUCCESS ).ignore() ;
m_h1 = 0 ;
m_h2 = 0 ;
m_h3 = 0 ;
@@ -427,12 +422,12 @@ StatusCode Kali::Pi0::initialize () // the proper initialzation
if ( sc.isFailure() ) { return sc ; }
//
if ( m_mirror )
- { Warning ( "Albert's trick is activated!", StatusCode::SUCCESS ) ; }
+ { Warning ( "Albert's trick is activated!", StatusCode::SUCCESS ).ignore() ; }
else
- { Warning ( "Albert's trick is deactivated!", StatusCode::SUCCESS ) ; }
+ { Warning ( "Albert's trick is deactivated!", StatusCode::SUCCESS ).ignore() ; }
//
if ( 0 < m_veto_dm || 0 < m_veto_chi2 )
- { Warning ( "Pi0-Veto is activated!", StatusCode::SUCCESS ) ; }
+ { Warning ( "Pi0-Veto is activated!", StatusCode::SUCCESS ).ignore() ; }
//
setupHistos() ;
//
diff --git a/ReleaseNotes/v43r1.md b/ReleaseNotes/v43r1.md
new file mode 100644
index 0000000000000000000000000000000000000000..fee62c488420383811e827381d2824e586f2ef56
--- /dev/null
+++ b/ReleaseNotes/v43r1.md
@@ -0,0 +1,17 @@
+2017-10-26 DaVinci v43r1
+========================
+
+This version is released on the master branch. For developments and a future 2018-patches branch.
+
+It is based on Gaudi v29r0, LHCb v43r1, Lbcom v21r1, Rec v22r1, Phys v24r1, Analysis v19r1 and Stripping v11r4,
+and uses LCG_91 with ROOT 6.10.06.
+
+- Fix untested StatusCodes exposed by gaudi/Gaudi!386.
+ - See merge request !110
+- Add StrippingCache for S29r1.
+ - See merge request !99
+- Fix most of the failing Tesla tests.
+ - See merge request !95
+- Fix stripping tests.
+ - See merge request !93
+- Various tests and/ reference files in DaVinciTests updated.