Changeset 1313 for trunk/examples/advanced/composite_calorimeter

Timestamp:

Jun 14, 2010, 3:54:58 PM (14 years ago)

Author:

garnier

Message:

geant4.9.4 beta rc0

Location:

trunk/examples/advanced/composite_calorimeter

Files:

• CompositeCalorimeter.cc (modified) (1 diff)
• GNUmakefile (modified) (2 diffs)
• History (modified) (2 diffs)
• README (modified) (5 diffs)
• src/CCalEndOfEventAction.cc (modified) (2 diffs)
• test.g4mac (modified) (1 diff)

trunk/examples/advanced/composite_calorimeter/CompositeCalorimeter.cc

@@ -122 +122 @@
     // visCommand = "/vis/open DAWNFILE";
     // visCommand = "/vis/open VRML2FILE";
-    visCommand = "/vis/open OGLIX";
+    visCommand = "/vis/open OGL";
     UI->ApplyCommand(visCommand);
 

trunk/examples/advanced/composite_calorimeter/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.11 2008/06/15 18:13:06 cirrone Exp $
+# $Id: GNUmakefile,v 1.12 2010/01/11 14:28:16 gcosmo Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -9 +9 @@
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../
+  G4INSTALL = ../..
 endif
 

trunk/examples/advanced/composite_calorimeter/History

@@ -1 +1 @@
 -------------------------------------------------------------------
-$Id: History,v 1.31 2006/11/14 14:39:51 ribon Exp $
+$Id: History,v 1.35 2010/06/06 06:18:17 perl Exp $
 -------------------------------------------------------------------
 
@@ -9 +9 @@
                       Example History file
                       ---------------------
+
+04.06.2010 - J.Perl (ccal-V09-03-00)
+- Updated vis usage 
+
+12.11.2009 - A.Ribon (ccal-V09-02-01)
+- Use QGSP_BIC_EMY as default Physics List to test the 
+  low-energy electromagnetic.
+
+22.02.2009
+ -  G.Folger;     Tag: ccal-V09-02-00
+    Fix compilation warnings in CCalRunAction.cc and CCalEndOfEventAction.cc
+
+15.06.2008 
+ - G.A.P.Cirrone; Tag: ccal-V09-01-00
+    Removed no more necessary AIDA commands from GNUmakefile
 
 14.11.2006 - A.Ribon (ccal-V08-01-01)

trunk/examples/advanced/composite_calorimeter/README

@@ -1 +1 @@
 -------------------------------------------------------------------
-$Id: README,v 1.12 2006/07/25 11:02:56 gcosmo Exp $
+$Id: README,v 1.14 2010/06/06 06:18:17 perl Exp $
 -------------------------------------------------------------------
 
@@ -236 +236 @@
  
  By the default, one of the ufficial High Energy Physics List for 
- Calorimetry, QGSC, is used in this example. However, it is 
- very easy to use instead either LHEP or QGSP. To do so, it is
- enough to comment/uncomment a line in the main CompositeCalorimeter.cc :
- for example, if you want to use LHEP instead of the default QGSC
- you have to change it as follows:
+ Calorimetry, QGSP_BIC_EMY, is used in this example, so that it
+ allows to test the low-energy electromagnetic.
+ However, it is very easy to use instead either LHEP, QGSP, or QGSC. 
+ To do so, it is enough to comment/uncomment a line in the main 
+ CompositeCalorimeter.cc : for example, if you want to use LHEP 
+ instead of the default QGSP_BIC_EMY you have to change it as follows:
 
   //***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***
 
@@ -251 +253 @@
  in which we don't even take into account the beam profile, noise
  and digitization!) the faster LHEP Physics List would be good enough
- for calorimetry studies. However, we prefer to use, as default, the
- more sophisticated (but slower) QGSC Physics List for the learning 
- purposes of this example.
+ for calorimetry studies. 
 
 
@@ -438 +438 @@
      Idle> /run/beamOn 3
 
- Notice that, by default, OGLIX is used for the visualization,
+ Notice that, by default, OGL is used for the visualization,
  because it is quite fast and it does not produce any files in
  output. However, you can always choose something else, for example
@@ -448 +448 @@
     visCommand = "/vis/open DAWNFILE";
     // visCommand = "/vis/open VRML2FILE";
-    // visCommand = "/vis/open OGLIX";
+    // visCommand = "/vis/open OGL";
 
  The tracks that are shown include both charged and neutral particles 

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

@@ -48 +48 @@
 #include <map>
 
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
-
 #ifdef G4ANALYSIS_USE
 #include "CCalAnalysis.hh"
@@ -247 +243 @@
   }
 #endif
-
-  //A.R. Add to visualize tracks
-  // extract the trajectories and draw them
-  if (G4VVisManager::GetConcreteInstance()) {
-    G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
-    G4int n_trajectories = 0;
-    if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
-    for (G4int i=0; i<n_trajectories; i++) { 
-      G4Trajectory* trj = (G4Trajectory*) ((*(evt->GetTrajectoryContainer()))[i]);
-      trj->DrawTrajectory(50); // Draw all tracks
-      // if ( trj->GetCharge() != 0. ) trj->DrawTrajectory(50); // Draw only charged tracks
-      // if ( trj->GetCharge() == 0. ) trj->DrawTrajectory(50); // Draw only neutral tracks
-    }
-  }
-
 }
 

trunk/examples/advanced/composite_calorimeter/test.g4mac

@@ -16 +16 @@
 /gun/energy 100 GeV
 
+#/control/execute vis.mac
+
 ### Simulate ten events
 /run/beamOn 10