Commit 6e23b5f2 authored by hmd's avatar hmd
Browse files

Merged with the trunk


git-svn-id: svn+ssh://svn.cern.ch/reps/gaudi/Gaudi/branches/GAUDI/GAUDI_nativedep@6445 53ecefc3-a64d-0410-9bdf-b8581fa3287e
parent 63606ed6
package Gaudi
version v21r11
version v22r1
branches doc cmt
use GaudiSys *
......
Package : Gaudi
Package manager : Marco Clemencic
================================ Gaudi v22r1 =================================
================================ Gaudi v22r0 =================================
! 2010-12-17 - Eoin Smith
- Updated gaudirun.py and python/Gaudi/Main.py for multicore execution
Multicore Execution with flag : --ncpus=N ( N in {-1,0,...,Z} )
......
# $Id: requirements,v 1.73 2008/11/10 18:48:45 marcocle Exp $
# $Id: requirements,v 1.73 2008/11/10 18:48:45 marcocle Exp $
# =============================================================================
package GaudiAlg
version v13r4
version v13r6
# ============== structure ====================================================
# ============== structure ====================================================
branches GaudiAlg src cmt doc
# ============== dependencies =================================================
use GaudiKernel *
use GaudiUtils *
use GaudiKernel *
use GaudiUtils *
use ROOT * LCG_Interfaces
use AIDA * LCG_Interfaces -no_auto_imports
use Boost * LCG_Interfaces -no_auto_imports
# ============== own includes =================================================
apply_pattern install_more_includes more="GaudiAlg"
# ============== constituents =================================================
......@@ -22,13 +22,3 @@ library GaudiAlg components/*.cpp -import=AIDA -no_static
# ============== patterns =====================================================
apply_pattern linker_library library="GaudiAlgLib"
apply_pattern component_library library="GaudiAlg"
private
##############################################################################
# Intel compiler support
### Disable some non interesting "remarks" (inspired by CoolKernel)
# Non permanent
# - warning #1125: function "C::X()" is hidden by "Y::X" -- virtual function override intended?
# (coming from ISequencerTimerTool methods start, stop and name)
macro_append cppflags '' no-hide-warnings '' target-icc '-wd1125 '
end_private
// $Id: SequencerTimerTool.h,v 1.7 2005/07/29 16:49:43 hmd Exp $
#ifndef SEQUENCERTIMERTOOL_H
#ifndef SEQUENCERTIMERTOOL_H
#define SEQUENCERTIMERTOOL_H 1
// Include files
......@@ -25,16 +25,16 @@ TimingAuditor().TIMER.ColumnWidth = 50 \endverbatim
*/
class SequencerTimerTool : public GaudiTool, virtual public ISequencerTimerTool{
public:
public:
/// Standard constructor
SequencerTimerTool( const std::string& type,
SequencerTimerTool( const std::string& type,
const std::string& name,
const IInterface* parent);
virtual ~SequencerTimerTool( ); ///< Destructor
/** initialize method, to compute the normalisation factor **/
/** initialize method, to compute the normalization factor **/
virtual StatusCode initialize();
/** finalize method, to print the time summary table **/
......@@ -50,7 +50,7 @@ public:
std::string space( m_headerSize, ' ' );
myName += name + space ;
myName = myName.substr( 0, m_headerSize );
m_timerList.push_back( TimerForSequencer(myName, m_normFactor) );
return m_timerList.size() -1;
};
......@@ -58,22 +58,25 @@ public:
/** Increase the indentation of the name **/
virtual void increaseIndent() { m_indent += 2; };
/** Decrease the indentation fo the name **/
virtual void decreaseIndent() {
m_indent -= 2;
if ( 0 > m_indent ) m_indent = 0;
/** Decrease the indentation of the name **/
virtual void decreaseIndent() {
m_indent -= 2;
if ( 0 > m_indent ) m_indent = 0;
};
using ISequencerTimerTool::start;
/** start the counter, i.e. register the current time **/
void start( int index ) { m_timerList[index].start(); };
using ISequencerTimerTool::stop;
/** stop the counter, return the elapsed time **/
double stop( int index ) { return m_timerList[index].stop(); };
/** returns the last time **/
double lastTime( int index ) { return m_timerList[index].lastTime(); };
/** returns the name of the counter **/
using ISequencerTimerTool::name;
/** returns the name of the counter **/
std::string name( int index ) { return m_timerList[index].name(); };
/** returns the index of the counter with that name, or -1 **/
......@@ -85,7 +88,7 @@ public:
protected:
private:
int m_shots; ///< Number of shots for CPU normalisation
int m_shots; ///< Number of shots for CPU normalization
bool m_normalised; ///< Is the time scaled to a nominal PIII ?
int m_indent; ///< Amount of indentation
std::vector<TimerForSequencer> m_timerList;
......
package GaudiExamples
version v21r11
version v22r1
use ROOT * LCG_Interfaces
use Reflex * LCG_Interfaces -no_auto_imports
......
......@@ -434,5 +434,3 @@ ChronoStatSvc.f... INFO Service finalized successfully
HistogramDataSvc DEBUG Substituted histograms #1 :
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyVertex instances:0
Number of MyTrack instances:0
......@@ -434,5 +434,3 @@ ChronoStatSvc.f... INFO Service finalized successfully
HistogramDataSvc DEBUG Substituted histograms #1 :
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -104,5 +104,3 @@ Listing sources of suppressed message:
AlgErrorAuditor | ERROR | 6
MyAudAlgorithm | INFO | 13
=====================================================
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -248,5 +248,3 @@ ChronoStatSvc INFO Time User : Tot= 1.16 [s]
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -262,5 +262,3 @@ ChronoStatSvc INFO Time User : Tot= 1.13 [s]
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -231,5 +231,3 @@ MyAlg.MyTool INFO destructor has been called
ToolSvc.MyTool INFO destructor has been called
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyVertex instances:0
Number of MyTrack instances:0
......@@ -367,5 +367,3 @@ ToolSvc.PubTool... INFO destructor has been called
MyAlg.PrivToolH... INFO destructor has been called
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyVertex instances:0
Number of MyTrack instances:0
......@@ -334,5 +334,3 @@ ToolSvc.TestPub... INFO destructor has been called
MyGaudiAlg.Priv... INFO destructor has been called
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyVertex instances:0
Number of MyTrack instances:0
......@@ -117,5 +117,3 @@ ApplicationMgr SUCCESS
ServiceManager DEBUG ---- EventLoopMgr (refCount = 3)
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyVertex instances:0
Number of MyTrack instances:0
......@@ -105,5 +105,3 @@ Counter SUCCESS Number of counters : 9
EventLoopMgr INFO Histograms converted successfully according to request.
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -55,5 +55,3 @@ CounterSvc SUCCESS "Sum::CounterTest" | 10000 | 5.0005e+
CounterSvc SUCCESS "TotalCount::CounterTest" | 10000 | 10000 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyVertex instances:0
Number of MyTrack instances:0
......@@ -55,5 +55,3 @@ CounterSvc SUCCESS "Sum::CounterTest" | 10000 |5.0005e+0
CounterSvc SUCCESS "TotalCount::CounterTest" | 10000 | 10000 | 1.0000 | 0.00000 | 1.0000 | 1.0000 |
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -268,5 +268,3 @@ DataListenerSvc DEBUG ApMon deleted
DataListenerSvc INFO finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
......@@ -76,5 +76,3 @@ DataOnDemandSvc INFO Handled "DataFault" incidents: 20/20/40(Alg/Node/Total
DbSession INFO Closed DbSession
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Number of MyTrack instances:0
Number of MyVertex instances:0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment