Merge branch 'master' of gitlab.engr.illinois.edu:dmaclea2/zdclg

src/DetectorConstruction.cc

@@ -71,7 +71,7 @@ DetectorConstruction::DetectorConstruction()
     m_pmtPos( new G4ThreeVector(28.5*mm, 35.0*mm, -7.5*mm) ),
     m_rotation( new G4RotationMatrix() ),
     m_pmtDia(10.5*mm),
-    m_PMTthickness(0.25*mm),
+    m_PMTthickness(0.001*mm),
     m_ConstructionHasBeenDone(false),
     m_UsingCADmodel(true),
     m_logicWorld(0),
@@ -299,7 +299,7 @@ void DetectorConstruction::BuildPMT(){
       m_SDnames.push_back("IntSD1");
       PMT = new PMTSD(m_SDnames.back(), true); // isIntermediate set to true
       SDman->AddNewDetector( PMT );
-      m_solidIntSD.push_back( new G4Box("soldIntSD1",20.00*mm, 0.1*mm, 2.00*mm) );
+      m_solidIntSD.push_back( new G4Box("soldIntSD1",20.00*mm, 0.001*mm, 2.00*mm) );
       m_logicIntSD.push_back( new G4LogicalVolume(m_solidIntSD.back(), materials->Air, "logicIntSD1") );
       m_logicIntSD.back()->SetVisAttributes(VisAtt_PMT);
       m_logicIntSD.back()->SetSensitiveDetector( PMT );
@@ -310,7 +310,7 @@ void DetectorConstruction::BuildPMT(){
       m_SDnames.push_back("IntSD2");
       PMT = new PMTSD(m_SDnames.back(), true); // isIntermediate set to true
       SDman->AddNewDetector( PMT );
-      m_solidIntSD.push_back( new G4Box("soldIntSD2",50.00*mm, 0.1*mm, 1.00*mm) );
+      m_solidIntSD.push_back( new G4Box("soldIntSD2",50.00*mm, 0.001*mm, 1.00*mm) );
       m_logicIntSD.push_back( new G4LogicalVolume(m_solidIntSD.back(), materials->Air, "logicIntSD2") );
       m_logicIntSD.back()->SetVisAttributes(VisAtt_PMT);
       m_logicIntSD.back()->SetSensitiveDetector( PMT );

src/EventAction.cc

@@ -57,7 +57,7 @@ EventAction::~EventAction()
  */
 void EventAction::BeginOfEventAction(const G4Event* event){
 
-  if(event->GetEventID()%100000 == 0) G4cout << "Begin Event " << event->GetEventID() << G4endl;
+  if(event->GetEventID()%1000 == 0) G4cout << "Begin Event " << event->GetEventID() << G4endl;
 
 }
 
@@ -68,5 +68,7 @@ void EventAction::EndOfEventAction(const G4Event* event){
   // fill ntuple  //
   G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
   analysisManager->FillNtupleIColumn( 0, 0, event->GetEventID());
-  analysisManager->AddNtupleRow();
+  for(G4int i = 0; i < analysisManager->GetNofNtuples(); i++){
+    analysisManager->AddNtupleRow(i);
+  }
 }

src/PMTSD.cc

@@ -91,6 +91,8 @@ void PMTSD::Initialize(G4HCofThisEvent* HCE){
 
   m_nHits = 0;
 
+  for(auto vec : m_PtrVec ) vec->clear();
+
 }