lcdd/src/lcdd/detectors

diff -u -r1.1.2.1 -r1.1.2.2
--- OpticalCalorimeterHitProcessor.cc	14 Aug 2013 00:23:23 -0000	1.1.2.1
+++ OpticalCalorimeterHitProcessor.cc	20 Aug 2013 00:09:45 -0000	1.1.2.2
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/Attic/OpticalCalorimeterHitProcessor.cc,v 1.1.2.1 2013/08/14 00:23:23 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/Attic/OpticalCalorimeterHitProcessor.cc,v 1.1.2.2 2013/08/20 00:09:45 jeremy Exp $

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

@@ -24,6 +24,12 @@

 bool OpticalCalorimeterHitProcessor::processHits(G4Step* step)
 {
     std::cout << "OpticalCalorimeterHitProcessor::processHits" << std::endl;

+    std::cout << "pre-step xyz = " <<
+        step->GetPreStepPoint()->GetPosition().x() << " " <<
+        step->GetPreStepPoint()->GetPosition().y() << " " <<
+        step->GetPreStepPoint()->GetPosition().z() << std::endl;
+    //std::cout << std::endl;
+    //return false;

 
     G4int NCerenPhotons = 0;
     G4Track* theTrack = step->GetTrack();

@@ -34,6 +40,7 @@

     const G4VTouchable* touch = step->GetPreStepPoint()->GetTouchable();
     G4String thematerial = touch->GetVolume()->GetLogicalVolume()->GetMaterial()->GetName();
     G4double MeanNumberOfPhotons = _cerenGenerator->GetAverageNumberOfPhotons(charge, beta, thematerial);

+    std::cout << "MeanNumberOfPhotons: " << MeanNumberOfPhotons << std::endl;

     if (MeanNumberOfPhotons > 0.0) {
         G4double step_length = step->GetStepLength();
         MeanNumberOfPhotons = MeanNumberOfPhotons * step_length;

@@ -42,7 +49,10 @@

         NCerenPhotons = 0;
     }
 

+    std::cout << "NCerenPhotons: " << NCerenPhotons << std::endl;
+

     if (NCerenPhotons <= 0) {

+    	std::cout << "no ceren photons generated; calling CalorimeterHitProcessor::processHits" << std::endl;

         return CalorimeterHitProcessor::processHits(step);
     } else {
         //SensitiveDetector::ProcessHits(aStep, 0);

@@ -51,9 +61,9 @@

         G4Navigator* theNavigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
         G4VPhysicalVolume* myVolume = theNavigator->LocateGlobalPointAndSetup(myPoint);
         //if (_calorimeter->getVerbose() > 2) {

-        //    G4cout << "Physical volume       = " << myVolume->GetName() << G4endl;
-        //    G4cout << "Point of interaction  = " << myPoint<< G4endl;
-        //    G4cout << "sdname " << GetName() << "  hcname " <<collectionName[0]<< G4endl;

+        G4cout << "Physical volume       = " << myVolume->GetName() << G4endl;
+        G4cout << "Point of interaction  = " << myPoint<< G4endl;
+        //G4cout << "sdname " << this->_calorimeter->GetName() << "  hcname " <<collectionName[0]<< G4endl;

         //}
             // total photon energy
             // G4double theEdep = aTrack->GetTotalEnergy();