LISTSERV 16.5 - LCD-CVS Archives

for (G4int i = 0; i < num_entries; i++) { // get the name of this SD G4String sdname = HCtbl->GetSDname(i); // retrieve corresponding Sensitive Detector from Geant4 store and cast to LCDD type

- const std::vector<G4SensitiveDetector*>& sds = getSensitiveDetectors(); - for (std::vector<G4SensitiveDetector*>::const_iterator it = sds.begin(); it != sds.end(); it++) { - G4SensitiveDetector* sd = (*it);

+ const std::vector<SensitiveDetector*>& sds = getSensitiveDetectors(); + for (std::vector<SensitiveDetector*>::const_iterator it = sds.begin(); it != sds.end(); it++) { + SensitiveDetector* sd = (*it);

slic/src

LcioHitsCollectionBuilder.cc 1.26 -> 1.27

diff -u -r1.26 -r1.27
--- LcioHitsCollectionBuilder.cc	26 Jun 2013 01:57:02 -0000	1.26
+++ LcioHitsCollectionBuilder.cc	1 Jul 2013 21:01:31 -0000	1.27
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.26 2013/06/26 01:57:02 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.27 2013/07/01 21:01:31 jeremy Exp $

 
 // SLIC
 #include "LcioHitsCollectionBuilder.hh"

@@ -73,8 +73,8 @@

 #endif
 
 		// retrieve Sensitive Detector ptr

-		G4SensitiveDetector *SD =
-				static_cast<G4SensitiveDetector*>(G4SDManager::GetSDMpointer()->FindSensitiveDetector(

+		SensitiveDetector *SD =
+				static_cast<SensitiveDetector*>(G4SDManager::GetSDMpointer()->FindSensitiveDetector(

 						HCtbl->GetSDname(hcid)));
 
 		// get hits collection

@@ -132,16 +132,16 @@

 
 // create the CollectionVec (decides which overloaded subfunction to call)
 IMPL::LCCollectionVec* LcioHitsCollectionBuilder::createCollectionVec(G4VHitsCollection* g4HC,

-		G4SensitiveDetector::EType SDtype) {

+		SensitiveDetector::EType SDtype) {

 	// vec to create
 	LCCollectionVec* collVec = 0;
 
 	// cal hits

-	if (SDtype == G4SensitiveDetector::eCalorimeter) {

+	if (SDtype == SensitiveDetector::eCalorimeter) {

 		collVec = createCalorimeterCollectionVec(g4HC);
 	}
 	// tracker hits

-	else if (SDtype == G4SensitiveDetector::eTracker) {

+	else if (SDtype == SensitiveDetector::eTracker) {

 		collVec = createTrackerCollectionVec(g4HC);
 	}
 	// unknown type of hit

@@ -189,11 +189,11 @@

 	m_calCollFlag.setBit(LCIO::CHBIT_ID1);
 }

-void LcioHitsCollectionBuilder::setEndcapFlag(G4SensitiveDetector* g4sd) {

+void LcioHitsCollectionBuilder::setEndcapFlag(SensitiveDetector* g4sd) {

 	bool ec_flag = g4sd->getEndcapFlag();
 
 	// set for cal

-	if (g4sd->getType() == G4SensitiveDetector::eCalorimeter) {

+	if (g4sd->getType() == SensitiveDetector::eCalorimeter) {

 		if (ec_flag) {
 			m_calCollFlag.unsetBit(LCIO::CHBIT_BARREL);
 		} else {

@@ -201,7 +201,7 @@

 		}
 	}
 	// set for trk

-	else if (g4sd->getType() == G4SensitiveDetector::eTracker) {

+	else if (g4sd->getType() == SensitiveDetector::eTracker) {

 		if (ec_flag) {
 			m_trkCollFlag.unsetBit(LCIO::THBIT_BARREL);
 		} else {

@@ -215,7 +215,7 @@

 		IMPL::LCCollectionVec* lcioColl) {
 	size_t s = calHits->GetSize();
 	for (size_t i = 0; i < s; i++) {

-		G4CalorimeterHit* calHit = static_cast<G4CalorimeterHit*>(calHits->GetHit(i));

+		CalorimeterHit* calHit = static_cast<CalorimeterHit*>(calHits->GetHit(i));

 		lcioColl->push_back(createHit(calHit));
 	}
 }

@@ -224,13 +224,13 @@

 void LcioHitsCollectionBuilder::saveHits(G4TrackerHitsCollection* trkHits, IMPL::LCCollectionVec* lcioColl) {
 	size_t s = trkHits->GetSize();
 	for (size_t i = 0; i < s; i++) {

-		G4TrackerHit* trkHit = static_cast<G4TrackerHit*>(trkHits->GetHit(i));

+		TrackerHit* trkHit = static_cast<TrackerHit*>(trkHits->GetHit(i));

 		lcioColl->push_back(createHit(trkHit));
 	}
 }
 
 // create cal hit from G4

-IMPL::SimCalorimeterHitImpl* LcioHitsCollectionBuilder::createHit(G4CalorimeterHit* calHit) {

+IMPL::SimCalorimeterHitImpl* LcioHitsCollectionBuilder::createHit(CalorimeterHit* calHit) {

 	SimCalorimeterHitImpl* simCalHit = new SimCalorimeterHitImpl();
 
 	// set cellid from cal hit's id64

@@ -271,7 +271,7 @@

 }
 
 // create trk hit from G4

-IMPL::SimTrackerHitImpl* LcioHitsCollectionBuilder::createHit(G4TrackerHit* trkHit) {

+IMPL::SimTrackerHitImpl* LcioHitsCollectionBuilder::createHit(TrackerHit* trkHit) {

 	SimTrackerHitImpl* simTrkHit = new SimTrackerHitImpl();
 
 	// position in mm

@@ -317,7 +317,7 @@

 }
 
 // add an MCParticle hit contribution from G4 to LCIO

-void LcioHitsCollectionBuilder::addMcpContribs(G4CalorimeterHit* g4CalHit,

+void LcioHitsCollectionBuilder::addMcpContribs(CalorimeterHit* g4CalHit,

 		IMPL::SimCalorimeterHitImpl* simCalHit) {
 	// Create empty hit contrib list.
 	McpHitContribList contribs;

@@ -336,7 +336,7 @@

 	size_t ncontrib = 0;
 	for (McpHitContribList::const_iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
 		// This contrib.

-		const McpHitContrib& contrib = (*iter);

+		const HitContribution& contrib = (*iter);

 
 		// Get the MCParticle pointer from the track ID.
 		MCParticleImpl* contribMcp = m_mcpManager->getMaps()->findMcpFromTrackID(contrib.getTrackID());

@@ -386,7 +386,7 @@

 		//log().debug("Combining hits on trk_id: " + StringUtil::toString( trk_id ) );
 
 		// old track id in new combined list?

-		McpHitContrib* trk_contrib = 0;

+		HitContribution* trk_contrib = 0;

 		if ((trk_contrib = findMcpHitContribByTrackID((*iter).getTrackID(), combinedContrib))) {
 			// Add to the energy deposition.
 			trk_contrib->incrEdep((*iter).getEdep());

@@ -398,14 +398,14 @@

 		else {
 			// Create a new contribution.
 			combinedContrib.push_back(

-					McpHitContrib(trkId, (*iter).getEdep(), (*iter).getPDGID(), (*iter).getGlobalTime()));

+					HitContribution(trkId, (*iter).getEdep(), (*iter).getPDGID(), (*iter).getGlobalTime()));

 		}
 	}
 }

-McpHitContrib* LcioHitsCollectionBuilder::findMcpHitContribByTrackID(int trk_id,

+HitContribution* LcioHitsCollectionBuilder::findMcpHitContribByTrackID(int trk_id,

 		McpHitContribList& contribs) {

-	McpHitContrib* c = 0;

+	HitContribution* c = 0;

 	for (McpHitContribList::iterator iter = contribs.begin(); iter != contribs.end(); iter++) {
 		if ((*iter).getTrackID() == trk_id) {
 			c = &(*iter);

Commit in `slic` on MAIN
`include/EventAction.hh`	+3	-3	1.12 -> 1.13
`/HitsCollectionUtil.hh`	+3	-3	1.9 -> 1.10
`/LcioHitsCollectionBuilder.hh`	+13	-13	1.8 -> 1.9
`/LcioManager.hh`	+4	-4	1.60 -> 1.61
`/SteppingAction.hh`	+2	-2	1.15 -> 1.16
`/TrajectoryManager.hh`	+6	-7	1.34 -> 1.35
`src/HitsCollectionUtil.cc`	+12	-12	1.6 -> 1.7
`/LcioHitsCollectionBuilder.cc`	+19	-19	1.26 -> 1.27
`/LcioManager.cc`	+3	-3	1.94 -> 1.95
`/SteppingAction.cc`	+3	-3	1.15 -> 1.16
`/TrajectoryManager.cc`	+6	-6	1.52 -> 1.53
	+74	-75