2 removed + 4 modified, total 6 files
slic/include
diff -u -r1.17 -r1.18
--- LcioMessenger.hh 22 Sep 2005 21:38:59 -0000 1.17
+++ LcioMessenger.hh 28 Sep 2005 22:21:11 -0000 1.18
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/LcioMessenger.hh,v 1.17 2005/09/22 21:38:59 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/LcioMessenger.hh,v 1.18 2005/09/28 22:21:11 jeremy Exp $
#ifndef slic_LcioMessenger_hh
#define slic_LcioMessenger_hh 1
@@ -45,7 +45,6 @@
G4UIcommand* m_fileExistsActionCmd;
G4UIcommand* m_mcpFilenameCmd;
G4UIcmdWithAnInteger* m_setRunNumberCmd;
- G4UIcmdWithABool* m_storeMomentumCmd;
G4UIcmdWithABool* m_autonameCmd;
G4UIcmdWithABool* m_dumpEventCmd;
};
slic/include
diff -N TrackerHitMomentum.hh
--- TrackerHitMomentum.hh 22 Sep 2005 21:39:00 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-// $Header: /cvs/lcd/slic/include/Attic/TrackerHitMomentum.hh,v 1.5 2005/09/22 21:39:00 jeremy Exp $
-#ifndef slic_TrackerHitMomentum_hh
-#define slic_TrackerHitMomentum_hh 1
-
-// lcio
-#include "IMPL/LCGenericObjectImpl.h"
-#include "IMPL/LCCollectionVec.h"
-#include "EVENT/LCEvent.h"
-#include "EVENT/LCIO.h"
-
-//geant4
-#include "G4ThreeVector.hh"
-#include "G4TrackerHit.hh"
-
-namespace slic
-{
-
- /**
- * @class TrackerHitMomentum
- * @brief Simple Lcio-based Helper class for writing out in-order vector
- * of momenta for tracker hits.
- */
- class TrackerHitMomentum
- {
-
- public:
-
- static IMPL::LCGenericObjectImpl* createLCGenericObject(const G4ThreeVector &trkP);
- static void makeTrackerHitMomenta(G4TrackerHitsCollection* trkHits, EVENT::LCEvent* evt);
-
- private:
- TrackerHitMomentum() {}
- };
-};
-
-#endif
slic/src
diff -u -r1.51 -r1.52
--- G4Application.cc 28 Sep 2005 18:52:28 -0000 1.51
+++ G4Application.cc 28 Sep 2005 22:21:12 -0000 1.52
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.51 2005/09/28 18:52:28 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.52 2005/09/28 22:21:12 jeremy Exp $
#include "G4Application.hh"
// slic
@@ -517,14 +517,6 @@
0);
cmd_mgr->addCmd(cmd_limits, "/physics/enableLimits");
- // tracker momentum
- CmdLineOpt* cmd_mom = new CmdLineOpt("t",
- "momentum",
- "Enable storage of momentum in LCIO tracker hits.",
- 0,
- 0);
- cmd_mgr->addCmd(cmd_mom, "/lcio/storeMomentum");
-
// random seed
CmdLineOpt* rndSeed = new CmdLineOpt("d",
"seed",
slic/src
diff -u -r1.4 -r1.5
--- LcioHitsCollectionBuilder.cc 22 Sep 2005 21:39:06 -0000 1.4
+++ LcioHitsCollectionBuilder.cc 28 Sep 2005 22:21:12 -0000 1.5
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.4 2005/09/22 21:39:06 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.5 2005/09/28 22:21:12 jeremy Exp $
#include "LcioHitsCollectionBuilder.hh"
// slic
#include "LcioMcpManager.hh"
#include "HitsCollectionUtil.hh"
#include "G4Application.hh"
-#include "TrackerHitMomentum.hh"
// lcio
#include "IMPL/LCCollectionVec.h"
@@ -144,11 +143,6 @@
saveHits(trkHits,
collVec);
- // save the momentum in parallel vec
- if ( m_storeMomentum ) {
- TrackerHitMomentum::makeTrackerHitMomenta(trkHits, m_currentLCEvent);
- }
-
// set trk flags
collVec->setFlag( m_trkCollFlag.getFlag() );
slic/src
diff -u -r1.27 -r1.28
--- LcioMessenger.cc 22 Sep 2005 21:39:06 -0000 1.27
+++ LcioMessenger.cc 28 Sep 2005 22:21:12 -0000 1.28
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.27 2005/09/22 21:39:06 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.28 2005/09/28 22:21:12 jeremy Exp $
#include "LcioMessenger.hh"
// slic
@@ -61,9 +61,6 @@
else if ( cmd == m_fileExistsActionCmd ) {
m_mgr->setFileExistsAction( LcioManager::getFileExistsActionFromString( s ) );
}
- else if ( cmd == m_storeMomentumCmd ) {
- m_mgr->setStoreMomentum( true );
- }
// setRunNumber
else if ( cmd == m_setRunNumberCmd ) {
m_mgr->setRunNumber( StringUtil::toInt( s ) );
@@ -162,12 +159,6 @@
p = new G4UIparameter( "mode", 's', false );
m_fileExistsActionCmd->SetParameter( p );
- // storeMomentum for tracker hits
- m_storeMomentumCmd = new G4UIcmdWithABool( "/lcio/storeMomentum", this );
- m_storeMomentumCmd->SetGuidance( "Store momentum in tracker hits." );
- m_storeMomentumCmd->SetParameterName( "enable", 'b', true );
- m_storeMomentumCmd->SetDefaultValue( true );
-
// set the starting run number
m_setRunNumberCmd = new G4UIcmdWithAnInteger( "/lcio/runNumber", this );
m_setRunNumberCmd->SetGuidance( "Set starting run number for LCIO event." );
slic/src
diff -N TrackerHitMomentum.cc
--- TrackerHitMomentum.cc 22 Sep 2005 00:22:53 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-// $Header: /cvs/lcd/slic/src/Attic/TrackerHitMomentum.cc,v 1.3 2005/09/22 00:22:53 jeremy Exp $
-#include "TrackerHitMomentum.hh"
-
-using IMPL::LCGenericObjectImpl;
-using IMPL::LCCollectionVec;
-using EVENT::LCEvent;
-using EVENT::LCIO;
-
-namespace slic
-{
-
- IMPL::LCGenericObjectImpl* TrackerHitMomentum::createLCGenericObject(const G4ThreeVector &trkP)
- {
- LCGenericObjectImpl* obj = new LCGenericObjectImpl();
- obj->setFloatVal(0, trkP.x()/GeV );
- obj->setFloatVal(1, trkP.y()/GeV );
- obj->setFloatVal(2, trkP.z()/GeV );
- return obj;
- }
-
- void TrackerHitMomentum::makeTrackerHitMomenta(G4TrackerHitsCollection* trkHits, EVENT::LCEvent* evt)
- {
- // new coll
- LCCollectionVec* coll = new LCCollectionVec( LCIO::LCGENERICOBJECT );
-
- // loop over input coll
- size_t s = trkHits->GetSize();
- for (size_t i = 0; i<s; i++) {
-
- // get trk hit
- G4TrackerHit* trkhit = static_cast<G4TrackerHit*> ( trkHits->GetHit(i) );
-
- // create generic obj of momentum for this hit
- LCGenericObjectImpl* obj = TrackerHitMomentum::createLCGenericObject( trkhit->getMomentum() );
-
- // push onto Lcio coll
- coll->push_back(obj);
- }
-
- // add to event
- evt->addCollection( coll, trkHits->GetName() + "_Momentum" );
- }
-};
CVSspam 0.2.8