Changeset 1313 for trunk/examples/advanced/air_shower

Timestamp:

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

Author:

garnier

Message:

geant4.9.4 beta rc0

Location:

trunk/examples/advanced/air_shower

Files:

• GNUmakefile (modified) (1 diff)
• History (modified) (3 diffs)
• Visualisation.mac (modified) (1 diff)
• src/UltraEventAction.cc (modified) (2 diffs)

trunk/examples/advanced/air_shower/GNUmakefile

@@ -8 +8 @@
 
 ifndef G4INSTALL
-  G4INSTALL = ../../..
+  G4INSTALL = ../..
 endif
 

trunk/examples/advanced/air_shower/History

@@ -1 @@
-$Id: History,v 1.14 2007/09/30 23:05:58 gum Exp $
+$Id: History,v 1.24 2010/06/06 06:13:59 perl Exp $
 -------------------------------------------------------------------
 
@@ -8 +8 @@
                            History file
                            ------------
+02.06.2010 - J.Perl (air_shower-V09-03-00)
+             Updated vis usage
+
+16.11.2009 -- B. Tomé,
+              Tag air_shower-V09-02-06
+              Changed UltraPhysicsList.cc to use new processes G4eMultipleScattering, G4MuMultipleScattering
+              and G4hMultipleScattering 
+              Tested example air_shower with Geant4 tag geant4-09-02-ref-10
+
+15.05.2009 -- B. Tomé, 
+              Updated README file. Tag air_shower-V09-01-00
+              Tested example with Geant4 tag geant4-09-02-ref-04 and iAIDA-1.0.14
+
+10.12.2008 -- G.A.P.Cirrone, Tag: air_shower-V09-01-05
+              Updated README file;
+03.07.2008 -- B. Tomé;  Tag air_shower-V09-01-04
+              Access to private data members of UltraDetectorConstruction through Get functions.
+
+03.07.2008 -- B. Tomé;  Tag air_shower-V09-01-03
+              Adjusted range of optical properties tables in UltraDetectorConstruction;
+              Added check of optical photon energy in UltraPrimaryGeneratorAction;
+              Cerenkov process attached to all applicable particles;
+              Modified Visualisation.mac and UltraMacro.mac files
+              
+26.06.2008 -- G.A.P.Cirrone; Tag air_shower-V09-01-02
+              Corrected a parameter in the UltraDetectorConstruction to remove a segmentation
+              due to a non correct definition of the refraction index of the Quartz.
+
+15.06.2008 -- G.A.P.Cirrone; Tag: air_shower-V09-01-01
+              Removed no more necessary AIDA commands from GNUmakefile
+
+11.06.2008 -- G.A.P.Cirrone air_shower-V09-01-00
+              Solved a compilation error in the Analysis Manager 
 
 30.09.2007 -- P.Gumplinger - air_shower-V09-00-00
@@ -38 +71 @@
            -- Corrected usage of <strstream> in RunActionMessenger.
            -- Corrected call to Visualisation.mac from Ultra.cc.
-              - Changed viewer to OGLSX in Visualisation.mac.
+           -- Changed viewer to OGLSX in Visualisation.mac.
 
 03.05.2005 -- J.Allison

trunk/examples/advanced/air_shower/Visualisation.mac

@@ -3 +3 @@
 /run/verbose 2
 #
-# create empty scene
+# Use this open statement to create an OpenGL view:
+#/vis/open OGL 600x600-0+0
 #
-#/vis/scene/create Space
-#/vis/scene/notifyHandlers Space flush
-/vis/scene/create 
+# Use this open statement to create a .prim file suitable for
+# viewing in DAWN:
+/vis/open DAWNFILE
 #
-# Create a scene handler for a specific graphics system
-# (Edit the next line(s) to choose another graphic system)
+# Use this open statement to create a .heprep file suitable for
+# viewing in HepRApp:
+#/vis/open HepRepFile
 #
-#/vis/open OGLIX
-#/vis/open RayTracer
-#/vis/open OGLSX
-/vis/open DAWNFILE
-#/vis/open HepRepFile
+# Use this open statement to create a .wrl file suitable for
+# viewing in a VRML viewer:
 #/vis/open VRML2FILE
 #
-/vis/viewer/set/viewpointThetaPhi 90.0 0.0 deg
-/vis/viewer/zoom 1.
-/vis/viewer/flush
+# Disable auto refresh and quieten vis messages whilst scene and
+# trajectories are established:
+/vis/viewer/set/autoRefresh false
+/vis/verbose errors
+#
+# Draw geometry:
+/vis/drawVolume
+#
+# Specify view angle:
+/vis/viewer/set/viewpointThetaPhi 90. 0.
+#
+# Specify zoom value:
+#/vis/viewer/zoom 2.
+#
+# Specify style (surface or wireframe):
+#/vis/viewer/set/style wireframe
+#
+# Draw coordinate axes:
+#/vis/scene/add/axes 0 0 0 1 m
+#
+# Draw smooth trajectories at end of event, showing trajectory points
+# as markers 2 pixels wide:
+/vis/scene/add/trajectories smooth
+/vis/modeling/trajectories/create/drawByCharge
+/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
+/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
+# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
+#
+# Draw hits at end of event:
+#/vis/scene/add/hits
+#
+# To draw only gammas:
+#/vis/filtering/trajectories/create/particleFilter
+#/vis/filtering/trajectories/particleFilter-0/add gamma
+#
+# To invert the above, drawing all particles except gammas,
+# keep the above two lines but also add:
+#/vis/filtering/trajectories/particleFilter-0/invert true
+#
+# Many other options are available with /vis/modeling and /vis/filtering.
+# For example, to select colour by particle ID:
+#/vis/modeling/trajectories/create/drawByParticleID
+#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
+#
+# To superimpose all of the events from a given run:
+/vis/scene/endOfEventAction accumulate
+#
+# Re-establish auto refreshing and verbosity:
 /vis/viewer/set/autoRefresh true
+/vis/verbose warnings
 #
-# for drawing the tracks
-# (if too many tracks cause core dump => storeTrajectory 0)
-/tracking/storeTrajectory 1
-/tracking/verbose 0
-#/vis/drawView
-
-/vis/scene/add/trajectories 
-/vis/scene/endOfEventAction accumulate
-#/vis/drawVolume
+# For file-based drivers, use this to create an empty detector view:
+#/vis/viewer/flush
+#
 /gps/particle opticalphoton
 /gps/energy 2.0 eV      
 /mysetrun/SetRunID 9999
 /run/beamOn 100
-

trunk/examples/advanced/air_shower/src/UltraEventAction.cc

@@ -51 +51 @@
 #include "G4VHitsCollection.hh"
 #include "G4GeneralParticleSource.hh" 
-
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 
 #ifdef G4ANALYSIS_USE
@@ -134 +130 @@
   analysis->FillHistogram(2,nOptHits);
 #endif
-
-  // Define visualization atributes:
-
-  G4String drawFlag = "all";
-  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
-
-  if(pVVisManager)
-  {
-   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]);
-        if (drawFlag == "all") trj->DrawTrajectory();
-        else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
-                               trj->DrawTrajectory(); 
-      }
-  }
-
 }