From 0bb8a5e26f1b2aa043c7916fbc5995b5dc275b4a Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 17:11:46 +0200
Subject: [PATCH] 'CMakeLists.txt' (CommissionUtils-00-00-29)
* src/CosmicTriggerTimeTool.cxx - Update for TrackRecordCollection
becoming an AtlasHitsVector. ATLASSIM-1784
* Tagging: CommissionUtils-00-00-29
---
Commission/CommissionUtils/CMakeLists.txt | 37 +++++++++++++++++++
.../src/CosmicTriggerTimeTool.cxx | 16 +++-----
2 files changed, 42 insertions(+), 11 deletions(-)
create mode 100644 Commission/CommissionUtils/CMakeLists.txt
diff --git a/Commission/CommissionUtils/CMakeLists.txt b/Commission/CommissionUtils/CMakeLists.txt
new file mode 100644
index 00000000000..44da15c485f
--- /dev/null
+++ b/Commission/CommissionUtils/CMakeLists.txt
@@ -0,0 +1,37 @@
+################################################################################
+# Package: CommissionUtils
+################################################################################
+
+# Declare the package name:
+atlas_subdir( CommissionUtils )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthenaBaseComps
+ Control/AthenaKernel
+ GaudiKernel
+ PRIVATE
+ Commission/CommissionEvent
+ LArCalorimeter/LArSimEvent
+ Simulation/G4Sim/TrackRecord )
+
+# External dependencies:
+find_package( CLHEP )
+
+# Component(s) in the package:
+atlas_add_library( CommissionUtilsLib
+ src/*.cxx
+ PUBLIC_HEADERS CommissionUtils
+ PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CommissionEvent LArSimEvent )
+
+atlas_add_component( CommissionUtils
+ src/components/*.cxx
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel CommissionEvent LArSimEvent CommissionUtilsLib )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+
diff --git a/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx b/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx
index b4f5df22338..b4063c39e21 100644
--- a/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx
+++ b/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx
@@ -73,24 +73,18 @@ double CosmicTriggerTimeTool::trackRecordTime()
return 0;
}
- // TimedTrackRecordCollection::const_iterator it = coll->begin();
- // TimedTrackRecordCollection::const_iterator it_e = coll->end();
- TrackRecordCollection::const_iterator it = coll->begin();
- TrackRecordCollection::const_iterator it_e = coll->end();
-
double t = 0;
- for (; it!=it_e;++it) {
+ for (auto it : *coll) {
// TimedTrackRecord * r = const_cast<TimedTrackRecord*>( *it );
- TrackRecord * r = const_cast<TrackRecord*>( *it );
- CLHEP::Hep3Vector pos = r->GetPosition();
- CLHEP::Hep3Vector p = r->GetMomentum();
+ CLHEP::Hep3Vector pos = it.GetPosition();
+ CLHEP::Hep3Vector p = it.GetMomentum();
// ATH_MSG_DEBUG( "TimedTrackRecord xyz position " <<pos.x()<<" "
ATH_MSG_DEBUG( "TrackRecord xyz position " <<pos.x()<<" "
<< pos.y() << " " << pos.z() );
ATH_MSG_DEBUG( " momentum " <<p.x() << " "
<< p.y() << " " << p.z() );
- ATH_MSG_DEBUG( " time " << r->GetTime() );
- t += r->GetTime() ;
+ ATH_MSG_DEBUG( " time " << it.GetTime() );
+ t += it.GetTime() ;
}
t = t/n ;
--
GitLab