Changeset 1230 for trunk/examples/advanced/composite_calorimeter

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/advanced/composite_calorimeter

Files:

• CompositeCalorimeter.cc (modified) (2 diffs)
• GNUmakefile (modified) (2 diffs)
• src/CCalEndOfEventAction.cc (modified) (2 diffs)
• src/CCalRunAction.cc (modified) (1 diff)

trunk/examples/advanced/composite_calorimeter/CompositeCalorimeter.cc

@@ -37 +37 @@
 #include "QGSP.hh"
 #include "QGSC.hh"
+#include "QGSP_BIC_EMY.hh"
 
 #include "G4RunManager.hh"
@@ -61 +62 @@
 
   //***LOOKHERE*** CHOOSE THE PHYSICS LIST.
-  // runManager->SetUserInitialization(new LHEP);     // LHEP     
-  runManager->SetUserInitialization(new QGSP);     // QGSP   
-  // runManager->SetUserInitialization(new QGSC);     // QGSC
+  // runManager->SetUserInitialization(new LHEP);          // LHEP     
+  // runManager->SetUserInitialization(new QGSP);          // QGSP 
+  // runManager->SetUserInitialization(new QGSC);          // QGSC
+  runManager->SetUserInitialization(new QGSP_BIC_EMY);  // QGSP_BIC_EMY 
   //***endLOOKHERE***
 

trunk/examples/advanced/composite_calorimeter/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.10 2006/11/14 14:39:51 ribon Exp $
+# $Id: GNUmakefile,v 1.11 2008/06/15 18:13:06 cirrone Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -20 +20 @@
 include $(G4INSTALL)/config/binmake.gmk
 
-ifdef G4ANALYSIS_USE  
-  CPPFLAGS += `aida-config --include`
-  LDFLAGS  += `aida-config --lib`
-  LOADLIBS += `aida-config --lib`
-endif
 
+

trunk/examples/advanced/composite_calorimeter/src/CCalEndOfEventAction.cc

@@ -214 +214 @@
   }
 
+  delete[] edep;
+
+#ifdef G4ANALYSIS_USE
   G4ThreeVector pos = primaryGenerator->GetParticlePosition();
   float ener = primaryGenerator->GetParticleEnergy()/GeV;
@@ -219 +222 @@
   float y    = pos.y()/mm;
   float z    = pos.z()/mm;
-  delete[] edep;
-
-#ifdef G4ANALYSIS_USE
+
   CCalAnalysis* analysis = CCalAnalysis::getInstance();
   analysis->InsertEnergy(fullE);

trunk/examples/advanced/composite_calorimeter/src/CCalRunAction.cc

@@ -62 +62 @@
 void CCalRunAction::EndOfRunAction(const G4Run* aRun) {
 
-  G4cout << "Executing CCalRunAction" << G4endl;
+  G4cout << "### Run " << aRun->GetRunID() << " end." << G4endl;
 
   // A.R. Added for visualization of events.