5 modified files
slic/src
diff -u -r1.1 -r1.2
--- LcioEventSource.cc 17 May 2005 19:03:27 -0000 1.1
+++ LcioEventSource.cc 15 Sep 2005 04:34:25 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioEventSource.cc,v 1.1 2005/05/17 19:03:27 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioEventSource.cc,v 1.2 2005/09/15 04:34:25 jeremy Exp $
#include "LcioEventSource.hh"
#include "LcioMcpFilter.hh"
@@ -60,16 +60,16 @@
// @todo Actually use the ostream arg.
void LcioEventSource::dumpCurrentEvent(std::ostream&)
{
- std::cout << "LcioEventSource - Current Mcp Collection" << std::endl;
- LcioMcpManager::instance()->getMcpPrinter()->printMcpCollection( getCurrentMcpLCCollection() );
+ std::cout << "LcioEventSource - Current Mcp Collection" << std::endl;
+ LcioMcpManager::instance()->getPrinter()->printMcpCollection( getCurrentMcpLCCollection() );
}
void LcioEventSource::generate(G4Event* anEvent)
- {
+ {
assert( LcioMcpManager::instance()->getInitialMcpCollection() );
LcioManager::instance()
->getGenerator()
- ->generatePrimaryVertexFromMcpCollection(LcioMcpManager::instance()->getInitialMcpCollection(),
+ ->generatePrimaryVertexFromMcpCollection(LcioMcpManager::instance()->getInitialMcpCollection(),
anEvent );
}
@@ -80,7 +80,7 @@
}
void LcioEventSource::beginEvent(const G4Event* anEvent)
- {
+ {
// read an event
EventSourceWithInputFile::beginEvent( anEvent );
@@ -107,10 +107,9 @@
G4Exception("FATAL ERROR: No Mcp collection found in LCIO input event.");
}
}
- else {
+ else {
std::cerr << "ERROR: LCEvent is null" << std::endl;
}
return mcpColl;
}
-
};
slic/src
diff -u -r1.27 -r1.28
--- LcioHCBuilder.cc 26 May 2005 23:00:48 -0000 1.27
+++ LcioHCBuilder.cc 15 Sep 2005 04:34:25 -0000 1.28
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioHCBuilder.cc,v 1.27 2005/05/26 23:00:48 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioHCBuilder.cc,v 1.28 2005/09/15 04:34:25 jeremy Exp $
#include "LcioHCBuilder.hh"
// SLIC
@@ -292,7 +292,7 @@
simTrkHit->setCellID( trkHit->getId() );
// MCP using McpManager
- MCParticleImpl* mcp = m_mcpManager->findMcpFromTrackID( trkHit->getTrackID() );
+ MCParticleImpl* mcp = m_mcpManager->getMaps()->findMcpFromTrackID( trkHit->getTrackID() );
if ( !mcp ) {
std::cout << "WARNING: no MCP found for trackID <" << trkHit->getTrackID() << "> for trk hit." << std::endl;
@@ -335,7 +335,7 @@
const McpHitContrib& contrib = ( *iter );
// fetch associcated MCP pointer by trackID
- MCParticleImpl* contribMcp = m_mcpManager->findMcpFromTrackID( contrib.getTrackID() );
+ MCParticleImpl* contribMcp = m_mcpManager->getMaps()->findMcpFromTrackID( contrib.getTrackID() );
if ( contribMcp != 0 ) {
slic/src
diff -u -r1.1 -r1.2
--- LcioMcpFactory.cc 14 Sep 2005 23:09:49 -0000 1.1
+++ LcioMcpFactory.cc 15 Sep 2005 04:34:25 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.1 2005/09/14 23:09:49 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.2 2005/09/15 04:34:25 jeremy Exp $
#include "LcioMcpFactory.hh"
// slic
@@ -91,7 +91,7 @@
MCParticleImpl* mcp = 0;
// find associated primary
- G4PrimaryParticle* g4primary = m_manager->findPrimaryFromMcp( mcpInit );
+ G4PrimaryParticle* g4primary = m_manager->getMaps()->findPrimaryFromMcp( mcpInit );
// no associated primary with this initial mcp?
if( !g4primary ) {
@@ -116,7 +116,7 @@
MCParticleImpl* mcp = createMcpShallowCopy( mcpInit );
// should add to Mcp map here?
- m_manager->addInitialMcpToFinalMcpLink( mcpInit, mcp);
+ m_manager->getMaps()->addInitialMcpToFinalMcpLink( mcpInit, mcp);
// given initial, create and add daughters
addMcpDaughtersFromInitial( mcp, mcpInit );
@@ -173,7 +173,7 @@
* Link the input MCP to an output MCP in order to check later if it was
* already created.
*/
- m_manager->addInitialMcpToFinalMcpLink( mcpInit, mcp);
+ m_manager->getMaps()->addInitialMcpToFinalMcpLink( mcpInit, mcp);
return mcp;
}
@@ -231,7 +231,7 @@
if ( thisTrj->GetParentID() == trj->GetTrackID() ) {
// find matching primary Mcp input particle
- MCParticle* mcpPrim = m_manager->findPrimaryInitialMcpFromTrajectory( thisTrj );
+ MCParticle* mcpPrim = m_manager->getMaps()->findPrimaryInitialMcpFromTrajectory( thisTrj );
// create MCP output particle from this input daughter
MCParticleImpl* mcpDauNew = createMcpFromInitialAndTrajectory( thisTrj, mcpPrim );
@@ -293,7 +293,7 @@
return mcp;
}
- IMPL::MCParticleImpl* LcioMcpFactory::createMcpFromTrajectory( Trajectory* trj)
+ IMPL::MCParticleImpl* LcioMcpFactory::createMcpFromTrajectory( Trajectory* trj)
{
// new Mcp
MCParticleImpl* mcp = new MCParticleImpl();
@@ -328,7 +328,7 @@
mcp->setEndpoint( fEndPos );
// add to map of trkID -> mcp
- m_manager->addTrackIDToMcpLink( trj->GetTrackID(), mcp );
+ m_manager->getMaps()->addTrackIDToMcpLink( trj->GetTrackID(), mcp );
// set status codes from trajectory info (with no dep on any associated Mcps)
LcioMcpStatusSetter::setMcpStatusCodesFromTrajectory( trj, mcp );
@@ -357,8 +357,8 @@
while ( primDau ) {
// find input Mcp for the primary dau
- MCParticle* mcpDau = m_manager->findDaughterMcpFromPrimary( mcpInit,
- primDau );
+ MCParticle* mcpDau = m_manager->getMaps()->findDaughterMcpFromPrimary( mcpInit,
+ primDau );
// must find it or die
if ( 0 == mcpDau ) {
@@ -422,7 +422,7 @@
if ( trj->GetParentID() == parTrkID ) {
// lkp dau Mcp by track ID
- MCParticleImpl* dauMcp = m_manager->findMcpFromTrackID( trj->GetTrackID() );
+ MCParticleImpl* dauMcp = m_manager->getMaps()->findMcpFromTrackID( trj->GetTrackID() );
if ( dauMcp == 0 ) {
@@ -456,7 +456,7 @@
MCParticle* mcpChildInit = mcpInit->getDaughters()[i];
// use a search function to avoid insert when null!
- MCParticleImpl* mcpChildFinal = m_manager->findFinalParticleFromInitial( mcpChildInit );
+ MCParticleImpl* mcpChildFinal = m_manager->getMaps()->findFinalParticleFromInitial( mcpChildInit );
// if not added already
if ( mcpChildFinal == 0 ) {
slic/src
diff -u -r1.25 -r1.26
--- LcioPrimaryGenerator.cc 14 Sep 2005 23:10:38 -0000 1.25
+++ LcioPrimaryGenerator.cc 15 Sep 2005 04:34:25 -0000 1.26
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.25 2005/09/14 23:10:38 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.26 2005/09/15 04:34:25 jeremy Exp $
// slic
#include "LcioPrimaryGenerator.hh"
@@ -85,7 +85,7 @@
// check if case 1 (PreDecay)
if ( numPar > 0 ) {
parMcp = dynamic_cast<MCParticleImpl*>(mcp->getParents()[0]);
- g4parent = m_mcpManager->findPrimaryFromMcp( parMcp );
+ g4parent = m_mcpManager->getMaps()->findPrimaryFromMcp( parMcp );
if ( g4parent != 0 ) {
@@ -232,7 +232,7 @@
std::cout << "adding mcp <" << mcp << "> to primary <" << thePrimary << "> link" << std::endl << std::endl;
}
#endif
- m_mcpManager->addMcpToPrimaryLink(mcp, thePrimary );
+ m_mcpManager->getMaps()->addMcpToPrimaryLink(mcp, thePrimary );
}
#ifdef SLIC_VERBOSE
slic/src
diff -u -r1.21 -r1.22
--- StdHepToLcioConvertor.cc 13 Sep 2005 19:02:54 -0000 1.21
+++ StdHepToLcioConvertor.cc 15 Sep 2005 04:34:25 -0000 1.22
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.21 2005/09/13 19:02:54 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.22 2005/09/15 04:34:25 jeremy Exp $
#include "StdHepToLcioConvertor.hh"
// LCIO
@@ -115,6 +115,8 @@
// create based on args
IMPL::MCParticleImpl* StdHepToLcioConvertor::createMcpFromStdHep( int ihep, lStdHep* rdr, EVENT::LCCollection* mcpColl )
{
+ assert(mcpColl);
+
#ifdef SLIC_VERBOSE
if ( verbose() > 1 ) {
//cout << endl;
CVSspam 0.2.8