slic/src
diff -u -r1.37 -r1.38
--- LcioPrimaryGenerator.cc 17 Feb 2011 18:26:45 -0000 1.37
+++ LcioPrimaryGenerator.cc 8 Apr 2011 20:49:12 -0000 1.38
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.37 2011/02/17 18:26:45 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.38 2011/04/08 20:49:12 jeremy Exp $
// slic
#include "LogStream.hh"
@@ -36,7 +36,7 @@
{
#ifdef SLIC_LOG
- log() << LOG::debug << "********** Generating Event from LCIO MCParticles **********" << LOG::done;
+ log() << LOG::debug << "********** Generating Event from LCIO MCParticles **********" << LOG::endl << LOG::done;
#endif
assert( mcpVec );
@@ -72,16 +72,16 @@
#ifdef SLIC_LOG
log() << LOG::debug << "generating particle #" << i << ", pdg: " << mcp->getPDG() << ", name: " << pname << LOG::done;
- log() << LOG::debug << " vertex: ( " << mcp->getVertex()[0] << ", " << mcp->getVertex()[1] << ", " << mcp->getVertex()[2] << " )" << LOG::done;
+ log() << LOG::debug << "vertex: ( " << mcp->getVertex()[0] << ", " << mcp->getVertex()[1] << ", " << mcp->getVertex()[2] << " )" << LOG::done;
if (mcp->getEndpoint() != 0)
- log() << LOG::debug << " endp: ( " << mcp->getEndpoint()[0] << ", " << mcp->getEndpoint()[1] << ", " << mcp->getEndpoint()[2] << " )" << LOG::done;
- log() << LOG::debug << " time: " << mcp->getTime() << LOG::done;
+ log() << LOG::debug << "endp: ( " << mcp->getEndpoint()[0] << ", " << mcp->getEndpoint()[1] << ", " << mcp->getEndpoint()[2] << " )" << LOG::done;
+ log() << LOG::debug << "time: " << mcp->getTime() << LOG::done;
#endif
G4int numPar = mcp->getParents().size();
#ifdef SLIC_LOG
- log() << LOG::debug << " nparents: " << numPar << LOG::done;
+ log() << LOG::debug << "nparents: " << numPar << LOG::done;
#endif
/*
@@ -112,8 +112,8 @@
isPreDecay = true;
#ifdef SLIC_LOG
- log() << " PREDECAY" << LOG::done;
- log() << LOG::debug << " parIdx: " << LcioMcpManager::instance()->getMCParticleIndex(mcpVec, parMcp) << LOG::done;
+ log() << "PREDECAY" << LOG::done;
+ log() << LOG::debug << "parent idx: " << LcioMcpManager::instance()->getMCParticleIndex(mcpVec, parMcp) << LOG::done;
#endif
}
}
@@ -128,7 +128,7 @@
if ( mcp->getGeneratorStatus() == 1 ) {
#ifdef SLIC_LOG
- log() << LOG::debug << " FINAL STATE" << LOG::done;
+ log() << LOG::debug << "FINAL STATE" << LOG::done;
#endif
createPrimary = true;
@@ -154,7 +154,7 @@
if ( dist > m_mcpManager->getMinimumTrackingDistance() ) {
#ifdef SLIC_LOG
- log() << LOG::debug << " INTERMEDIATE OR DOC TO BE TRACKED" << LOG::done;
+ log() << LOG::debug << "INTERMEDIATE OR DOC TO BE TRACKED" << LOG::done;
#endif
createPrimary = true;
@@ -164,7 +164,7 @@
// *This particle will not be tracked.*
#ifdef SLIC_LOG
else {
- log() << LOG::debug << " INTERMEDIATE OR DOC THAT WILL NOT BE TRACKED" << LOG::done;
+ log() << LOG::debug << "INTERMEDIATE OR DOC THAT WILL NOT BE TRACKED" << LOG::done;
}
#endif
}
@@ -173,9 +173,9 @@
}
#ifdef SLIC_LOG
- log() << " isPreDecay: " << isPreDecay << LOG::done;
- log() << " createPrimary: " << createPrimary << LOG::done;
- log() << " createVertex: " << createVertex << LOG::done;
+ log() << "isPreDecay: " << isPreDecay << LOG::done;
+ log() << "createPrimary: " << createPrimary << LOG::done;
+ log() << "createVertex: " << createVertex << LOG::done;
#endif
// create a primary
@@ -195,29 +195,29 @@
G4ThreeVector parMom = g4parent->GetMomentum();
#ifdef SLIC_LOG
- log() << " parentMomentum: " << parMom << LOG::done;
+ log() << "parent p: " << parMom << LOG::done;
#endif
G4double E = sqrt(pow(g4parent->GetMass(), 2) + pow( parMom.x(), 2 ) + pow( parMom.y(), 2) + pow( parMom.z(), 2 ) );
#ifdef SLIC_LOG
- log() << " particleTime: " << mcp->getTime() << LOG::done;
- log() << " parentTime: " << parMcp->getTime() << LOG::done;
- log() << " parentMass: " << g4parent->GetMass() << LOG::done;
+ log() << "particle time: " << mcp->getTime() << LOG::done;
+ log() << "parent time: " << parMcp->getTime() << LOG::done;
+ log() << "parent mass: " << g4parent->GetMass() << LOG::done;
#endif
G4double proper_time = ( ( mcp->getTime() - parMcp->getTime() ) * g4parent->GetMass() ) / E;
#ifdef SLIC_LOG
- log() << LOG::debug << " parentE: " << E << LOG::done;
- log() << LOG::debug << " properTime: " << proper_time << LOG::done;
+ log() << LOG::debug << "parent E: " << E << LOG::done;
+ log() << LOG::debug << "proper time: " << proper_time << LOG::done;
#endif
g4parent->SetDaughter( thePrimary );
g4parent->SetProperTime( proper_time );
#ifdef SLIC_LOG
- log() << LOG::debug << " mcp decay time <" << mcp->getTime() - parMcp->getTime() << ">" << LOG::done;
+ log() << LOG::debug << "mcp decay time: " << mcp->getTime() - parMcp->getTime() << LOG::done;
#endif
}
}
@@ -256,7 +256,7 @@
{
#ifdef SLIC_LOG
log() << "createPrimaryVertexFromMcp" << LOG::done;
- log() << "particleTime: " << mcp->getTime() << LOG::done;
+ log() << "particle time: " << mcp->getTime() << LOG::done;
#endif
G4ThreeVector pos = G4ThreeVector( mcp->getVertex()[0],
