// Set the cached step data. setStep(aStep); // Call the processHits() methods of the registered HitProcessors. bool madeHits = false; for (HitProcessors::iterator it = _hitProcessors.begin(); it != _hitProcessors.end(); it++) {

- -//void SensitiveDetector::addHitsCollection(G4String collectionName) -//{ -// std::cout << "SensitiveDetector::addHitsCollection - " << collectionName << std::endl; -// this->collectionName.insert(collectionName); -// _hcids.push_back(-1); -//}

lcdd/src/lcdd/detectors

SensitiveDetectorFactory.cc 1.4.2.4 -> 1.4.2.5

diff -u -r1.4.2.4 -r1.4.2.5
--- SensitiveDetectorFactory.cc	17 Aug 2013 23:51:14 -0000	1.4.2.4
+++ SensitiveDetectorFactory.cc	22 Aug 2013 20:24:38 -0000	1.4.2.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/SensitiveDetectorFactory.cc,v 1.4.2.4 2013/08/17 23:51:14 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/SensitiveDetectorFactory.cc,v 1.4.2.5 2013/08/22 20:24:38 jeremy Exp $

 
 // LCDD
 #include "lcdd/detectors/SensitiveDetectorFactory.hh"

@@ -18,6 +18,7 @@

     SensitiveDetector* sensitiveDetector = 0;
     IdSpec* idspec = 0;
     std::vector<HitProcessor*> hitProcessors;

+    std::vector<std::string> hitProcessorNames;

     std::vector<G4String> hitsCollections;
 
     // The SAXObject must extend SensitiveDetectorType.

@@ -54,19 +55,8 @@

                 // Cast object to appropriate element type.
                 const hit_processor* hitProcessor = dynamic_cast<const hit_processor*>(seq->content(i).object);

-                // Get the type of the HitProcessor.
-                std::string type = hitProcessor->get_type();
-
-                // Lookup the HitProcessor type using the manager.
-                HitProcessorFactory* hitProcessorFactory = HitProcessorManager::instance()->getFactory(type);
-                if (hitProcessorFactory == 0) {
-                    std::cerr << "HitProcessorFactory was not found for type: " << hitProcessor->get_type() << std::endl;
-                    G4Exception("", "", FatalException, "HitProcessor not found");
-                }
-                HitProcessor* processor = hitProcessorFactory->createHitProcessor(sensitiveDetector);
-
-                // Add the HitProcessor to the list.
-                hitProcessors.push_back(processor);

+                // Push type name of HitProcessor onto list to be created later once SD is available.
+                hitProcessorNames.push_back(hitProcessor->get_type());

 
             // Process hits_collection child tag.
             } else if (childTag == "hits_collection") {

@@ -82,7 +72,8 @@

             }
         }

-        // Backward compatibility if hits collection is specified as an attribute value on the detector's XML element.

+        // This is for backward compatibility when hits collection is specified as an attribute value
+        // on the detector's XML element.

         std::string hitsCollectionName = sensitiveDetectorType->get_hitsCollectionName();
         if (hitsCollectionName != "") {
             hitsCollections.push_back(sensitiveDetectorType->get_hitsCollectionName());

@@ -114,6 +105,22 @@

         // Set the IdSpec.
         sensitiveDetector->setIdSpec(idspec);

+        // Create HitProcessors from list of type names.
+        for (std::vector<std::string>::iterator it = hitProcessorNames.begin(); it != hitProcessorNames.end(); it++) {
+        	std::string type = (*it);
+        	HitProcessorFactory* hitProcessorFactory = HitProcessorManager::instance()->getFactory(type);
+        	if (hitProcessorFactory == 0) {
+        		std::cerr << "HitProcessorFactory was not found for type: " << type << std::endl;
+        		G4Exception("", "", FatalException, "HitProcessor not found");
+        	}
+        	HitProcessor* processor = hitProcessorFactory->createHitProcessor(sensitiveDetector);
+
+        	std::cout << "create hits processor: " << type << std::endl;
+
+        	// Add the HitProcessor to the list.
+        	hitProcessors.push_back(processor);
+        }
+

         // Add the HitProcessors from the list.
         if (hitProcessors.size() > 0) {
             // Add HitProcessors created from XML if they were listed explicitly as child elements.

@@ -131,6 +138,12 @@

 
         // Register the SensitiveDetector with the LCDDProcessor.
         std::string sensitiveDetectorName = sensitiveDetector->GetName();

+        std::cout << "adding sensitive detector: " << sensitiveDetectorName << std::endl;
+        std::cout << "  HCs: ";
+        for (std::vector<G4String>::iterator it = hitsCollections.begin(); it != hitsCollections.end(); it++) {
+        	std::cout << (*it) << " ";
+        }
+        std::cout << std::endl;

         LCDDProcessor::instance()->addSensitiveDetector(sensitiveDetectorName, sensitiveDetector);
     } else {
         // This should never really happen.

@@ -190,6 +203,8 @@

     std::string hitsCollectionName = hitsCollections[0];
 
     // Create the basic TrackerSD.

+    std::cout << "creating new tracker: " << trackerElement->get_name() << std::endl;
+    std::cout << "  HC: " << hitsCollectionName << std::endl;

     TrackerSD* sd = new TrackerSD(trackerElement->get_name(), hitsCollectionName);
 
     return sd;

-/* -G4bool TrackerSD::ProcessHits(G4Step* aStep, G4TouchableHistory*) -{ - // set cached step - SensitiveDetector::ProcessHits(aStep, 0); - - // edep - G4double e = edep(); - - // check edep < cut - if (e <= getEnergyCut() && !isGeantino()) { - return false; - } - - // get track information - TrackInformation* trkInfo = trackInformation(); - - // set hit flag in trk info - trkInfo->setHasTrackerHit(true); - - // hit data - G4int trkID = trackID(); - G4double tdep = globalTime(); - G4ThreeVector midPos = midPosition(); - G4ThreeVector prePos = aStep->GetPreStepPoint()->GetPosition(); - G4ThreeVector postPos = aStep->GetPostStepPoint()->GetPosition(); - double avgMom = (pre()->GetMomentum().mag() + post()->GetMomentum().mag()) / 2; - G4ThreeVector mom = (postPos - prePos); - if (mom.mag() > 0) { - mom.setMag(avgMom); - } else { - std::cerr << "prePos - postPos = 0 --> " << prePos << " | " << postPos << std::endl; - } - - G4double pathLength = ReadoutUtil::computeDistance(aStep); - - // create hit - TrackerHit* trkHit = new TrackerHit(); - - // create id vector - Id64bit id64 = makeId(); - - // set track hit info - trkHit->setTrackID(trkID); - trkHit->setEdep(e); - trkHit->setPos(midPos); - trkHit->setMomentum(mom); - trkHit->setTdep(tdep); - trkHit->setId(id64.getId0()); - trkHit->setLength(pathLength); - - // add to HC - _HC->insert(trkHit); - - _hits.push_back(trkHit); - - return true; -} -*/ -

Commit in `lcdd/src/lcdd` on LCDD-102_BRANCH
`detectors/CalorimeterSD.cc`	+28	-9	1.6.2.1 -> 1.6.2.2
`/LegacyCalorimeterHitProcessor.cc`	+4	-3	1.1 -> 1.1.2.1
`/OpticalCalorimeterHitProcessor.cc`	+3	-36	1.1.2.3 -> 1.1.2.4
`/SensitiveDetector.cc`	+1	-11	1.5.2.1 -> 1.5.2.2
`/SensitiveDetectorFactory.cc`	+30	-15	1.4.2.4 -> 1.4.2.5
`/TrackerSD.cc`	+1	-67	1.4.2.1 -> 1.4.2.2
`processes/hits_collectionProcess.cc`	+1	-3	1.1.2.1 -> 1.1.2.2
	+68	-144