Import Geant4 9.2.0 source tree

2016-06-09 15:58:43 +02:00
parent 96c8bcd0af
commit b79225fb37
7544 changed files with 245407 additions and 91099 deletions
@@ -1,4 +1,4 @@
-$Id: History,v 1.129 2007/12/13 14:54:23 gcosmo Exp $
+$Id: History,v 1.141 2008/12/18 10:28:27 gcosmo Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -17,6 +17,104 @@ committal in the CVS repository !
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+18th December 2008  Gabriele Cosmo (examples-V09-02-00)
+- Updated reference outputs according to reference tag geant4-09-02-ref-00.
+- Includes tags: air_shower-V09-01-05, brachy-V09-01-03, gammaraytel-V09-01-02,
+                 Rich-V09-01-01, electromagnetic-V09-01-01, testem0-V09-01-01,
+                 testem1-V09-01-08, testem2-V09-01-08, testem3-V09-01-12,
+                 testem5-V09-01-13, testem7-V09-01-17, testem8-V09-01-02,
+                 testem9-V09-01-09, testem11-V09-01-07, testem12-V09-01-08,
+                 exgps-V09-01-02, fieldex04-V09-01-06, exhadr00-V09-01-02,
+                 exhadr01-V09-01-04, DICOM-V09-01-02, fano-V09-01-06,
+                 fano2-V09-01-06, LXe-V09-01-01, G01-V09-01-04,
+                 G02-V09-01-02, G03-V09-01-01, exampleP03-V09-01-04,
+                 exrdm-V09-01-04, exampleRE03-V09-01-00, exampleN03-V09-01-05,
+                 exampleN06-V09-01-03.
+
+7th November 2008  Gabriele Cosmo (examples-V09-01-09)
+- Updated reference outputs according to reference tag geant4-09-01-ref-09.
+- Includes tags: microbeam-V09-01-03, testem1-V09-01-07, testem2-V09-01-07,
+                 testem3-V09-01-10, testem5-V09-01-11, testem7-V09-01-15,
+                 testem9-V09-01-08, testem11-V09-01-06, testem12-V09-01-07,
+                 pythiaex-V09-01-00, fano-V09-01-05, fano2-V09-01-05,
+                 exampleN02-V09-01-04, exampleN03-V09-01-04.
+
+30th September 2008  Gabriele Cosmo (examples-V09-01-08)
+- Updated reference outputs according to reference tag geant4-09-01-ref-08.
+- Includes tags: hadrontherapy-V09-01-06, testem1-V09-01-05, testem2-V09-01-05,
+                 testem3-V09-01-07, testem4-V09-01-03, testem5-V09-01-08,
+                 testem6-V09-01-02, testem7-V09-01-12, testem9-V09-01-07,
+                 testem11-V09-01-04, testem12-V09-01-05, testem14-V09-01-03,
+                 testem15-V09-01-04, testem16-V09-01-02, testem17-V09-01-04,
+                 testem18-V09-01-04, exhadr01-V09-01-03, fano-V09-01-03,
+                 fano2-V09-01-03, persistencyEx-V09-01-00, exampleN02-V09-01-02.
+
+26th August 2008  Gabriele Cosmo (examples-V09-01-07)
+- Updated reference outputs according to reference tag geant4-09-01-ref-07.
+- Includes tags: air_shower-V09-01-04, microdosimentry-V09-01-04,
+                 testem9-V09-01-05, fieldex04-V09-01-03, exhadr00-V09-01-01,
+                 DICOM-V09-01-01, LXe-V09-01-00, exrdm-V09-01-01,
+                 exampleN06-V09-01-02.
+
+30th June 2008  Gabriele Cosmo (examples-V09-01-06)
+- Updated reference outputs according to reference tag geant4-09-01-ref-06.
+- Includes tags: air_shower-V09-01-02, brachy-V09-01-01, ccal-V09-01-00
+                 cosmicray_charging-V09-01-00, hadrontherapy-V09-01-05,
+                 gammaraytel-V09-01-00, lAr_calorimeter-V09-01-00,
+                 microbeam-V09-01-01, microdosimentry-V09-01-03, DMX-V09-01-01,
+                 nanobeam-V09-01-11, Rich-V09-01-00, Tiara-V09-01-00,
+                 xraytel-V09-01-00, monopole-V09-01-00, exhadr01-V09-01-02,
+                 fano-V09-01-02, fano2-V09-01-02, gtherapy-V09-01-00,
+                 expol01-V09-01-00, testem1-V09-01-03, testem2-V09-01-04,
+                 testem3-V09-01-06, testem4-V09-01-02, testem5-V09-01-05,
+                 testem6-V09-01-01, testem7-V09-01-09, testem8-V09-01-00,
+                 testem9-V09-01-04, testem10-V09-01-01, testem11-V09-01-03,
+                 testem12-V09-01-04, testem13-V09-01-00, testem14-V09-01-02,
+                 testem15-V09-01-03, testem16-V09-01-01, testem17-V09-01-03,
+                 exgdml-V09-01-02, testem18-V09-01-03, exampleN06-V09-01-00.
+- Retired advanced example "raredecay_calorimetry".
+
+4th June 2008  Gabriele Cosmo (examples-V09-01-05)
+- Updated reference outputs according to reference tag geant4-09-01-ref-05.
+- Includes tags: hadrontherapy-V09-01-04, nanobeam-V09-01-10,
+                 testem1-V09-01-02, testem2-V09-01-03, testem3-V09-01-05,
+                 testem4-V09-01-01, testem5-V09-01-04, testem6-V09-01-00,
+                 testem7-V09-01-08, testem9-V09-01-03, testem10-V09-01-00,
+                 testem11-V09-01-02, testem12-V09-01-03, testem14-V09-01-01,
+                 testem15-V09-01-02, testem16-V09-01-00, testem17-V09-01-02,
+                 testem18-V09-01-02, fieldex02-V09-01-01, fieldex04-V09-01-02,
+                 exhadr01-V09-01-00, fano-V09-01-01, fano2-V09-01-01,
+                 exampleN02-V09-01-01, exampleN03-V09-01-02,
+                 exampleN04-V09-01-00, exampleN06-V09-01-00,
+                 exampleN07-V09-01-00.
+
+6th May 2008  Gabriele Cosmo (examples-V09-01-04)
+- Updated reference outputs according to reference tag geant4-09-01-ref-04.
+- Includes tags: DMX-V09-01-00, testem1-V09-01-01, testem2-V09-01-02,
+                 testem3-V09-01-03, testem4-V09-01-00, testem5-V09-01-03,
+                 testem7-V09-01-05, testem9-V09-01-02, testem11-V09-01-01,
+                 testem12-V09-01-02, testem15-V09-01-01, testem17-V09-01-01,
+                 testem18-V09-01-01, fieldex02-V09-01-00, exgdml-V09-01-01,
+                 fano-V09-01-00, fano2-V09-01-00, exampleN03-V09-01-01.
+
+28th March 2008  Gabriele Cosmo (examples-V09-01-03)
+- Updated reference outputs according to reference tag geant4-09-01-ref-03.
+- Includes tags: nanobeam-V09-01-06, hadrontherapy-V09-01-03, testem3-V09-01-01,
+                 testem5-V09-01-02, testem7-V09-01-03, testem9-V09-01-00,
+                 testem17-V09-01-00, fieldex04-V09-01-01.
+
+28th February 2008  Gabriele Cosmo (examples-V09-01-02)
+- Updated reference outputs according to reference tag geant4-09-01-ref-02.
+- Includes tags: nanobeam-V09-01-03, testem3-V09-01-00, testem7-V09-01-02.
+
+1st February 2008  Gabriele Cosmo (examples-V09-01-01)
+- Updated reference outputs according to reference tag geant4-09-01-ref-01.
+- Includes tags: nanobeam-V09-01-01, testem0-V09-01-00, testem1-V09-01-00,
+                 testem2-V09-01-01, testem5-V09-01-01, testem7-V09-01-01,
+                 testem11-V09-01-00, testem12-V09-01-01, testem14-V09-01-00,
+                 testem15-V09-01-00, testem18-V09-01-00, exgdml-V09-01-00,
+                 DICOM-V09-01-00, exampleN03-V09-01-00.
+
 13th December 2007  Gabriele Cosmo (examples-V09-01-00)
 - Updated reference outputs according to reference tag geant4-09-01-ref-00.
 - Includes tags: hadrontherapy-V09-00-00, DMX-V09-00-02, testem1-V09-00-01,
@@ -1,4 +1,4 @@
-$Id: README,v 1.12 2007/08/28 10:20:39 gcosmo Exp $
+$Id: README,v 1.14 2008/06/17 09:35:45 gcosmo Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -124,6 +124,12 @@ Advanced level examples
 microbeam
   - Simulation of the cellular irradiation beam line installed on the AIFIRA
     electrostatic accelerator facility located at CENBG, France
+ microdosimetry
+   - Simulation of DNA physics processes with track of a 10 keV Helium+
+     (positive charge is +e) particle in liquid water.
+ nanobeam
+   - Simulation of the beam optics of the nanobeam line installed on the AIFIRA
+     electrostatic accelerator facility located at CENBG, France.
 purging_magnet
   - Simulation of electrons traveling through a 3D magnetic field of a
     strong purging magnet used for treatment head in a medical environment
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.5 2004/06/23 16:09:48 gcosmo Exp $
+# $Id: GNUmakefile,v 1.6 2008/06/23 09:26:07 gcosmo Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -11,7 +11,8 @@ include $(G4INSTALL)/config/architecture.gmk

 SUBDIRS =  gammaray_telescope underground_physics xray_fluorescence xray_telescope
 SUBDIRS += brachytherapy cosmicray_charging hadrontherapy
-SUBDURS += medical_linac purging_magnet radioprotection
+SUBDIRS += medical_linac purging_magnet radioprotection human_phantom
+SUBDIRS += air_shower microbeam microdosimetry nanobeam
 SUBDIRS += Tiara Rich composite_calorimeter lAr_calorimeter

 .PHONY : all clean clean_libs
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-$Id: History,v 1.11 2007/09/30 23:00:40 gum Exp $
+$Id: History,v 1.13 2008/11/24 14:34:11 cirrone Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -9,6 +9,12 @@ $Id: History,v 1.11 2007/09/30 23:00:40 gum Exp $
                      Category History file
                      ---------------------

+23.11.2008 - G.A.P.Cirrone; Tag: Rich-V09-01-01
+             Fixed compilation errors on the file RichTbEventAction
+
+14.06.2008 - G.A.P.Cirrone (Rich-V09-01-00)
+             Fixed compilation errors and removed warnigs
+
 30.09.2007 - P.Gumplinger (Rich-V09-00-00)
             adjust to the G4Cerenkov process now being a G4VDiscreteProcess

@@ -372,7 +372,7 @@ G4int icurpixel;

 static const G4int NumberOfHpds=4;
 static const G4double HpdPosRad=146.5*mm;
-static const G4double HpdZfromEnd=HpdMasterHalfZ-VesselPosZ+1.0*mm;;
+static const G4double HpdZfromEnd=HpdMasterHalfZ-VesselPosZ+1.0*mm;

 static const  G4double HpdMasterPosX[NumberOfHpds]=
    {HpdPosRad,0.0*mm,-HpdPosRad,0.0*mm};
@@ -1,6 +1,6 @@
 #  $Id: GNUmakefile,v 1.7 2004/12/08 15:37:13 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # --------------------------------------------------------------


@@ -1,6 +1,6 @@
-# $Id: History,v 1.31 2006/11/20 12:44:40 ahoward Exp $
+# $Id: History,v 1.32 2008/06/14 16:56:59 cirrone Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------

     =========================================================
@@ -19,6 +19,9 @@ committal in the CVS repository !
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+June 14th, 2006, G.A.P.Cirrone (Tiara-V09-01-00)
+- fixed compilation errors
+
 November 20th, 2006, A. Howard
 - removed hadronic_list.gmk from GNUmakefile to accommodate new reference 
  physicslist location
@@ -1,6 +1,6 @@
 # $Id: README,v 1.21 2005/03/17 19:48:27 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------

 Simulation of the TIARA experiment using importance sampling
@@ -1,6 +1,6 @@
 # $Id: envCommon.csh,v 1.13 2005/03/17 19:48:27 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 # Before sourcing this script make sure you have set the 
 # environment variables according to the description in README.
@@ -2,7 +2,7 @@
 #
 # $Id: runSim.py,v 1.12 2005/12/15 16:23:11 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------

 # importing python libraries
@@ -2,7 +2,7 @@
 #
 # $Id: runSimNoAnalysis.py,v 1.7 2005/12/15 16:23:06 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------


@@ -2,7 +2,7 @@
 #
 # $Id: runVisMode.py,v 1.8 2006/06/26 10:12:05 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------


@@ -2,7 +2,7 @@
 #
 # $Id: runVisNoAnalysis.py,v 1.5 2006/06/26 10:12:05 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------


@@ -1,6 +1,6 @@
 # $Id: vis.mac,v 1.2 2003/06/16 17:06:44 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------


@@ -1,6 +1,6 @@
 # $Id: CLHEP.i,v 1.5 2005/12/15 14:23:31 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------


@@ -1,6 +1,6 @@
 # $Id: G4String.i,v 1.1 2003/06/17 15:25:01 mdressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------

 // coppied from std_string.i
@@ -1,6 +1,6 @@
 # $Id: G4Kernel.i,v 1.7 2005/12/15 14:24:56 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------

 %module G4Kernel
@@ -1,6 +1,6 @@
 # $Id: Tiara.i,v 1.9 2005/12/14 13:18:40 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------

 %module Tiara
@@ -1,6 +1,6 @@
 # $Id: dataAcess.py,v 1.3 2003/06/26 11:54:13 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import os
@@ -1,6 +1,6 @@
 # $Id: detector.py,v 1.3 2003/06/26 11:54:13 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #

@@ -1,6 +1,6 @@
 # $Id: dpsManip.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import math
@@ -1,6 +1,6 @@
 # $Id: extractShelve.py,v 1.3 2003/07/04 13:26:31 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import string
@@ -1,6 +1,6 @@
 # $Id: myPI.py,v 1.1 2004/06/09 15:04:36 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import sys
@@ -1,6 +1,6 @@
 # $Id: myUtils.py,v 1.6 2004/12/08 15:37:14 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import CLHEP
@@ -1,6 +1,6 @@
 # $Id: parallelHall.py,v 1.4 2003/06/20 12:41:06 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import G4Kernel
@@ -1,6 +1,6 @@
 # $Id: posLog.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
        
@@ -1,6 +1,6 @@
 # $Id: runSequence.py,v 1.4 2004/06/09 15:04:36 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import Tiara
@@ -1,6 +1,6 @@
 # $Id: slabGeometry.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import math
@@ -1,6 +1,6 @@
 # $Id: tallyData.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #

@@ -1,6 +1,6 @@
 # $Id: tiaraApplication.py,v 1.7 2006/06/26 10:13:14 ahoward Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import string
@@ -1,6 +1,6 @@
 # $Id: tiaraDetectors.py,v 1.4 2004/06/09 15:04:36 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import CLHEP
@@ -1,6 +1,6 @@
 # $Id: tiaraGenerators.py,v 1.3 2004/06/09 15:04:36 daquinog Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import string
@@ -1,6 +1,6 @@
 # $Id: tiaraSpecifications.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import CLHEP
@@ -1,6 +1,6 @@
 # $Id: variableGeometry.py,v 1.2 2003/06/16 17:06:45 dressel Exp $
 # -------------------------------------------------------------------
-# GEANT4 tag $Name: geant4-09-01 $
+# GEANT4 tag $Name: geant4-09-02 $
 # -------------------------------------------------------------------
 #
 import G4Kernel
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraCellScorer.hh,v 1.4 2006/06/29 15:43:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // Class TiaraCellScorer
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraCellScorerStore.hh,v 1.3 2006/06/29 15:43:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // Class TiaraCellScorerStore
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraConcreteShieldA.hh,v 1.4 2006/06/29 15:43:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraConcreteShieldB.hh,v 1.4 2006/06/29 15:43:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraDPSSampledEnergy.hh,v 1.7 2006/06/29 15:43:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraDimensions.hh,v 1.4 2006/06/29 15:43:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraEnergyCutProcess.hh,v 1.4 2006/06/29 15:43:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraFileAcess.hh,v 1.4 2006/06/29 15:43:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraFixedEnergyGenerator.hh,v 1.4 2006/06/29 15:43:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraGeometry.hh,v 1.5 2006/06/29 15:43:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraIronShieldA.hh,v 1.4 2006/06/29 15:43:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraIronShieldB.hh,v 1.4 2006/06/29 15:43:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraIsotropicDirections.hh,v 1.4 2006/06/29 15:43:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraMaterials.hh,v 1.5 2006/06/29 15:43:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraMeasure.hh,v 1.4 2006/06/29 15:43:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraPart.hh,v 1.4 2006/06/29 15:44:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraPhysicsList.hh,v 1.1.1.2 2006/06/29 15:44:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // Class TiaraPhysicsList
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraPrimaryGeneratorAction.hh,v 1.1.1.2 2006/06/29 15:44:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #ifndef TiaraPrimaryGeneratorAction_hh
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraRandom.hh,v 1.4 2006/06/29 15:44:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraSampledEnergy.hh,v 1.5 2006/06/29 15:44:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraSim.hh,v 1.5 2006/06/29 15:44:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraTally.hh,v 1.5 2006/06/29 15:44:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraTimedEventAction.hh,v 1.1.1.2 2006/06/29 15:44:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // Class TiaraTimedEventAction
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraVComponent.hh,v 1.5 2006/06/29 15:44:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraVDirectionGenerator.hh,v 1.4 2006/06/29 15:44:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraVSourceEnergyGenerator.hh,v 1.4 2006/06/29 15:44:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 //
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraVisEventAction.hh,v 1.1.1.2 2006/06/29 15:44:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // Class TiaraVisEventAction
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraVisRunAction.hh,v 1.1.1.2 2006/06/29 15:44:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // Class TiaraVisRunAction
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraCellScorer.cc,v 1.5 2006/06/29 15:44:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: TiaraCellScorerStore.cc,v 1.1.1.2 2006/06/29 15:44:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// $Id: TiaraCellScorerStore.cc,v 1.2 2008/06/14 16:56:59 cirrone Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -48,20 +48,20 @@ G4CellScorer *TiaraCellScorerStore::
 AddG4CellScorer(const G4GeometryCell &g) {
  return fMapGeometryCellCellScorer[g] = 
    new G4CellScorer;
-};
+}

 void TiaraCellScorerStore::
 AddTiaraCellScorer(TiaraCellScorer *tiaraScorer,
 		 const G4GeometryCell &g) {
  fMapGeometryCellTiaraCellScorer[g] = tiaraScorer;
-};
+}

 void TiaraCellScorerStore::EndOfEventAction() {
  for (TiaraMapGeometryCellTiaraCellScorer::iterator it = fMapGeometryCellTiaraCellScorer.begin();
       it != fMapGeometryCellTiaraCellScorer.end(); it++) {
    (*it).second->EndOfEventAction();
  }
-};
+}

 const G4MapGeometryCellCellScorer &TiaraCellScorerStore::GetMapGeometryCellCellScorer()  {      
  for (TiaraMapGeometryCellTiaraCellScorer::iterator it = fMapGeometryCellTiaraCellScorer.begin();
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraConcreteShieldA.cc,v 1.4 2006/06/29 15:44:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraConcreteShieldA.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraConcreteShieldB.cc,v 1.4 2006/06/29 15:44:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraConcreteShieldB.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraDPSSampledEnergy.cc,v 1.9 2006/06/29 15:44:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraDPSSampledEnergy.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraDimensions.cc,v 1.4 2006/06/29 15:44:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraDimensions.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraEnergyCutProcess.cc,v 1.6 2006/06/29 15:44:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraEnergyCutProcess.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraFileAcess.cc,v 1.4 2006/06/29 15:44:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraFileAcess.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraFixedEnergyGenerator.cc,v 1.4 2006/06/29 15:45:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraFixedEnergyGenerator.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraGeometry.cc,v 1.5 2006/06/29 15:45:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraGeometry.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraIronShieldA.cc,v 1.4 2006/06/29 15:45:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraIronShieldA.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraIronShieldB.cc,v 1.4 2006/06/29 15:45:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraIronShieldB.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraIsotropicDirections.cc,v 1.5 2006/06/29 15:45:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraIsotropicDirections.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraMaterials.cc,v 1.5 2006/06/29 15:45:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraMaterials.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraMeasure.cc,v 1.4 2006/06/29 15:45:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraMeasure.hh"
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraPhysicsList.cc,v 1.6 2006/06/29 15:45:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "globals.hh"
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraPrimaryGeneratorAction.cc,v 1.5 2006/06/29 15:45:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "globals.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraRandom.cc,v 1.5 2006/06/29 15:45:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraRandom.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraSampledEnergy.cc,v 1.5 2006/06/29 15:45:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraSampledEnergy.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraSim.cc,v 1.9 2006/06/29 15:45:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraSim.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraStackingAction.cc,v 1.5 2006/06/29 15:45:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraStackingAction.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraTally.cc,v 1.5 2006/06/29 15:45:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraTally.hh"
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraTimedEventAction.cc,v 1.4 2006/06/29 15:45:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraVComponent.cc,v 1.4 2006/06/29 15:45:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraVComponent.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraVDirectionGenerator.cc,v 1.4 2006/06/29 15:45:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraVDirectionGenerator.hh"
@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TiaraVSourceEnergyGenerator.cc,v 1.4 2006/06/29 15:45:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //

 #include "TiaraVSourceEnergyGenerator.hh"
@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraVisEventAction.cc,v 1.4 2006/06/29 15:45:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

@@ -25,7 +25,7 @@
 //
 //
 // $Id: TiaraVisRunAction.cc,v 1.1.1.2 2006/06/29 15:45:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // 

@@ -22,11 +22,6 @@ ifdef ULTRA_GROUND_USE
  CPPFLAGS += -DULTRA_GROUND_USE
 endif

-ifdef G4ANALYSIS_USE
-  CPPFLAGS += `aida-config --include`
-  LDFLAGS += `aida-config --lib`
-endif
-

 .PHONY: all
 all: lib bin
@@ -1,4 +1,4 @@
-$Id: History,v 1.14 2007/09/30 23:05:58 gum Exp $
+$Id: History,v 1.20 2008/12/10 18:07:33 cirrone Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -7,6 +7,26 @@ $Id: History,v 1.14 2007/09/30 23:05:58 gum Exp $

                           History file
                           ------------
+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
           -- adjust to the G4Cerenkov process now being a G4VDiscreteProcess
@@ -37,7 +57,7 @@ $Id: History,v 1.14 2007/09/30 23:05:58 gum Exp $
 06.06.2005 -- G.Cosmo - air_shower-V07-00-00
           -- 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
           -- Replaced vis manager with G4VisExecutive.
@@ -48,11 +48,11 @@ processes is made.                                                      |
 ------------------------------------------------------------------------|
 ----> SET-UP 
                                                                        |
- -example enviroment with the compiler 3.2.3                              
+ -example enviroment with the compiler 3.4.6                              
 -a standard Geant4 example GNUmakefile is provided                     |

 setup with:                                                             |
-compiler = gcc-3.2.3
+compiler = gcc-3.4.6
 G4SYSTEM = linux-g++                                                    |

 The following environment variables can be set:                         |
@@ -1,16 +1,15 @@
 /control/verbose  1
 /run/verbose 2
 /event/verbose    0
-/tracking/verbose 0
+/tracking/verbose 1
 /run/initialize
-/gps/particle opticalphoton
+/gps/particle mu-
 /gps/direction 0.0 0.0 -1.0
 /gps/pos/centre  0.0 0.0 100. cm
 /gps/pos/type   Plane
 /gps/pos/shape  Circle
 /gps/pos/radius 25.0 cm
-/gps/energy 3.0 eV
+/gps/energy 300.0 MeV

 /mysetrun/SetRunID 9999
-/run/beamOn 100
-exit
+/run/beamOn 1
@@ -11,10 +11,10 @@
 # Create a scene handler for a specific graphics system
 # (Edit the next line(s) to choose another graphic system)
 #
-/vis/open OGLIX
+#/vis/open OGLIX
 #/vis/open RayTracer
 #/vis/open OGLSX
-#/vis/open DAWNFILE
+/vis/open DAWNFILE
 #/vis/open HepRepFile
 #/vis/open VRML2FILE
 #
@@ -32,8 +32,8 @@
 /vis/scene/add/trajectories 
 /vis/scene/endOfEventAction accumulate
 #/vis/drawVolume
-
-
+/gps/particle opticalphoton
+/gps/energy 2.0 eV	
 /mysetrun/SetRunID 9999
-/run/beamOn 50
+/run/beamOn 100

@@ -57,7 +57,7 @@ namespace AIDA{
  class IHistogramFactory;
  class IAnalysisFactory;
  class ITreeFactory;
-};
+}
 #endif

 class UltraAnalysisManager
@@ -59,6 +59,7 @@ class UltraFresnelLens;

 class UltraDetectorConstruction : public G4VUserDetectorConstruction
 {
+ 
  public:
    UltraDetectorConstruction();
    ~UltraDetectorConstruction();
@@ -66,6 +67,9 @@ class UltraDetectorConstruction : public G4VUserDetectorConstruction
  public:
    G4VPhysicalVolume* Construct();

+    inline G4double GetLambdaMin() const {return lambda_min;}
+    inline G4double GetLambdaMax() const {return lambda_max;}
+
  private:
    
  // Methods to build ULTRA
@@ -81,7 +85,9 @@ class UltraDetectorConstruction : public G4VUserDetectorConstruction
  private:
    UltraPMTSD*   PMTSD  ;          //pointer to the photomultiplier sensitive detector
    G4SDManager*  SDmanager ;       // Sensitive Detector Manager
-
+    
+    G4double lambda_min ;
+    G4double lambda_max ;
 };

 #endif 
@@ -75,6 +75,11 @@ UltraDetectorConstruction::UltraDetectorConstruction()

 // Sensitive Detector Manager
 SDmanager = G4SDManager::GetSDMpointer();
+
+// Define wavelength limits for materials definition
+ lambda_min = 200*nm ; 
+ lambda_max = 700*nm ; 
+
 }

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -224,27 +229,14 @@ void UltraDetectorConstruction::ConstructTableMaterials()
 // Construct Material Properties Tables
 /////////////////////////////////////////////

-  const G4int NUMENTRIES = 32;
+  const G4int NUMENTRIES = 2;

  // Energy bins
-  G4double X_RINDEX[NUMENTRIES] =
-            { 2.034E-9*GeV, 2.068E-9*GeV, 2.103E-9*GeV, 2.139E-9*GeV,
-              2.177E-9*GeV, 2.216E-9*GeV, 2.256E-9*GeV, 2.298E-9*GeV,
-              2.341E-9*GeV, 2.386E-9*GeV, 2.433E-9*GeV, 2.481E-9*GeV,
-              2.532E-9*GeV, 2.585E-9*GeV, 2.640E-9*GeV, 2.697E-9*GeV,
-              2.757E-9*GeV, 2.820E-9*GeV, 2.885E-9*GeV, 2.954E-9*GeV,
-              3.026E-9*GeV, 3.102E-9*GeV, 3.181E-9*GeV, 3.265E-9*GeV,
-              3.353E-9*GeV, 3.446E-9*GeV, 3.545E-9*GeV, 3.649E-9*GeV,
-              3.760E-9*GeV, 3.877E-9*GeV, 4.002E-9*GeV, 4.136E-9*GeV } ;
+  G4double X_RINDEX[NUMENTRIES] = {h_Planck*c_light/lambda_max, h_Planck*c_light/lambda_min} ; 


  // Air
-  G4double RINDEX_AIR[NUMENTRIES] =
-            { 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
-              1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
-              1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
-              1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
-              1.00, 1.00, 1.00, 1.00 } ;
+  G4double RINDEX_AIR[NUMENTRIES] = {1.00, 1.00} ; 

 // Air refractive index at 20 oC and 1 atm (from PDG) 
  for(G4int j=0 ; j<NUMENTRIES ; j++){
@@ -264,7 +256,7 @@ void UltraDetectorConstruction::ConstructTableMaterials()
  // Refractive index 

  const G4int N_RINDEX_QUARTZ = 2 ;
-  G4double X_RINDEX_QUARTZ[N_RINDEX_QUARTZ] = {0.0*eV, 10.0*eV};
+  G4double X_RINDEX_QUARTZ[N_RINDEX_QUARTZ] = {h_Planck*c_light/lambda_max, h_Planck*c_light/lambda_min} ; 
  G4double RINDEX_QUARTZ[N_RINDEX_QUARTZ] = {1.54, 1.54};

  G4MaterialPropertiesTable *MPT_PMT = new G4MaterialPropertiesTable();
@@ -279,21 +271,80 @@ void UltraDetectorConstruction::ConstructTableMaterials()

 // Refractive index 

-  const G4int    N_RINDEX_ACRYLIC = 3 ;
-  G4double X_RINDEX_ACRYLIC[N_RINDEX_ACRYLIC] = {320.0, 400.0, 500.0};  // Wavelength in nanometers
-  G4double RINDEX_ACRYLIC[N_RINDEX_ACRYLIC] = {1.526, 1.507, 1.497};
+  const G4int NENTRIES = 11 ;
+  G4double LAMBDA_ACRYLIC[NENTRIES] ;

-    // Convert from nm to GeV

-     for(G4int i=0;i<N_RINDEX_ACRYLIC; i++){
-      X_RINDEX_ACRYLIC[i] = ((1239.84/X_RINDEX_ACRYLIC[i])*1E-9)*GeV;
-      }
+  G4double RINDEX_ACRYLIC[NENTRIES] ;
+  G4double ENERGY_ACRYLIC[NENTRIES] ;
+
+// Parameterization for refractive index of High Grade PMMA 
+
+  G4double bParam[4] = {1760.7010,-1.3687,2.4388e-3,-1.5178e-6} ; 
+  
+  for(G4int i=0;i<NENTRIES; i++){
+ 
+    LAMBDA_ACRYLIC[i] = lambda_min + i*(lambda_max-lambda_min)/float(NENTRIES-1) ;
+    RINDEX_ACRYLIC[i] = 0.0 ;
+
+    for (G4int jj=0 ; jj<4 ; jj++)
+    {
+      RINDEX_ACRYLIC[i] +=  (bParam[jj]/1000.0)*std::pow(LAMBDA_ACRYLIC[i]/nm,jj) ; 
+    }
+
+    ENERGY_ACRYLIC[i] =   h_Planck*c_light/LAMBDA_ACRYLIC[i] ;  // Convert from wavelength to energy ;
+//  G4cout << ENERGY_ACRYLIC[i]/eV << " " << LAMBDA_ACRYLIC[i]/nm << " " << RINDEX_ACRYLIC[i] << G4endl ;
+
+  }

  G4MaterialPropertiesTable *MPT_Acrylic = new G4MaterialPropertiesTable();
-  MPT_Acrylic->AddProperty("RINDEX", X_RINDEX_ACRYLIC, RINDEX_ACRYLIC, N_RINDEX_ACRYLIC);
-  Acrylic->SetMaterialPropertiesTable(MPT_Acrylic);
+  MPT_Acrylic->AddProperty("RINDEX", ENERGY_ACRYLIC, RINDEX_ACRYLIC, NENTRIES);


+// Absorption
+  const G4int NENT = 25 ;
+  G4double LAMBDAABS[NENT] = 
+  {
+    100.0,
+    246.528671, 260.605103, 263.853516, 266.019104, 268.726105,    
+    271.433136, 273.598724, 276.305725, 279.554138, 300.127380,    
+    320.159241, 340.191101, 360.764343, 381.337585, 399.745239,    
+    421.401276, 440.891724, 460.382172, 480.414001, 500.987274,    
+    520.477722, 540.509583, 559.458618,
+    700.0    
+  } ;
+
+  G4double ABS[NENT] =   // Transmission (in %) of  3mm thick PMMA 
+  { 
+    0.0000000,
+    0.0000000,  5.295952,  9.657321, 19.937695, 29.283491, 
+    39.252335, 48.598133, 58.255451, 65.109039, 79.439247,
+    85.669785, 89.719627, 91.277260, 91.588783, 91.900307,
+    91.588783, 91.277260, 91.277260, 91.588783, 91.588783,
+    91.900307, 91.900307, 91.588783,
+    91.5
+  } ;
+
+
+  MPT_Acrylic->AddProperty("ABSLENGTH", new G4MaterialPropertyVector()) ;
+  for(G4int i=0;i<NENT; i++){
+    G4double energy    = h_Planck*c_light/(LAMBDAABS[i]*nm) ;
+    G4double abslength ;
+
+    if (ABS[i] <= 0.0) {
+      abslength = 1.0/kInfinity ;
+    }
+    else {
+      abslength = -3.0*mm/(std::log(ABS[i]/100.0)) ;
+    }
+
+    MPT_Acrylic->AddEntry("ABSLENGTH", energy, abslength);
+
+  }
+
+  Acrylic->SetMaterialPropertiesTable(MPT_Acrylic);
+  
+
 //////////////////////////////////////////////////////////////////

  G4cout << *(G4Material::GetMaterialTable()) << G4endl ;
@@ -343,7 +394,7 @@ OpticalAirMirror->SetType(dielectric_dielectric);
 OpticalAirMirror->SetFinish(polishedfrontpainted);

 const G4int NUM = 2;
-G4double XX[NUM] = { 0.1E-9*GeV, 10.0E-9*GeV };
+G4double XX[NUM] = {h_Planck*c_light/lambda_max, h_Planck*c_light/lambda_min} ; 
 G4double ICEREFLECTIVITY[NUM]      = { 0.95, 0.95 };

 G4MaterialPropertiesTable *AirMirrorMPT = new G4MaterialPropertiesTable();
@@ -402,7 +453,7 @@ OpticalAirGround->SetType(dielectric_dielectric);
 OpticalAirGround->SetFinish(groundfrontpainted);

 const G4int NUM = 2;
-G4double XX[NUM] = { 0.1E-9*GeV, 10.0E-9*GeV };
+G4double XX[NUM] = {h_Planck*c_light/lambda_max, h_Planck*c_light/lambda_min} ; 
 G4double ICEREFLECTIVITY[NUM]      = { 0.95, 0.95 };

 G4MaterialPropertiesTable *AirGroundMPT = new G4MaterialPropertiesTable();
@@ -565,7 +616,7 @@ OpticalAirPaint->SetType(dielectric_dielectric);
 OpticalAirPaint->SetFinish(groundfrontpainted);

 const G4int NUM = 2;
-G4double XX[NUM] = { 2.030E-9*GeV, 4.144E-9*GeV };
+G4double XX[NUM] = {h_Planck*c_light/lambda_max, h_Planck*c_light/lambda_min} ; 
 G4double BLACKPAINTREFLECTIVITY[NUM]      = { 0.05, 0.05 };
 //G4double WHITEPAINTREFLECTIVITY[NUM]      = { 0.99, 0.99 };

@@ -239,8 +239,6 @@ void UltraPhysicsList::ConstructOp()
 {
  // this Cerenkov Process
  G4Cerenkov*   theCerenkovProcess = new G4Cerenkov("Cerenkov");
-  // this is Scintillation process
-  G4Scintillation* theScintillationProcess = new G4Scintillation("Scintillation");
  // this absorption process inside optical media
  G4OpAbsorption* theAbsorptionProcess = new G4OpAbsorption();
  // Rayleigh scattering for optical photons (aerogel radiators)
@@ -250,7 +248,6 @@ void UltraPhysicsList::ConstructOp()

  // Chose level 0 (no verbose)
  theCerenkovProcess           -> SetVerboseLevel(0);
-  theScintillationProcess      -> SetVerboseLevel(0);
  theAbsorptionProcess         -> SetVerboseLevel(0);
  theRayleighScatteringProcess -> SetVerboseLevel(0);
  theBoundaryProcess           -> SetVerboseLevel(0);
@@ -261,10 +258,6 @@ void UltraPhysicsList::ConstructOp()
 //   theCerenkovProcess->SetMaxNumPhotonsPerStep(MaxNumPhotons);
  theCerenkovProcess->SetTrackSecondariesFirst(true);

-  theScintillationProcess->SetTrackSecondariesFirst(true);
-  theScintillationProcess->SetScintillationYieldFactor(1.);
-  theScintillationProcess->SetScintillationExcitationRatio(0.0);
-
  // Boundary model (UNIFIED OR GLISUR (OLD GEANT3)) For now only GEANT3
  G4OpticalSurfaceModel themodel = unified;
  theBoundaryProcess->SetModel(themodel);
@@ -276,15 +269,10 @@ void UltraPhysicsList::ConstructOp()
    G4String particleName = particle->GetParticleName();

    if (theCerenkovProcess->IsApplicable(*particle)) {
-      //      pmanager->AddProcess(theCerenkovProcess);
-      //      pmanager->SetProcessOrdering(theCerenkovProcess,idxPostStep);
+      pmanager->AddProcess(theCerenkovProcess);
+      pmanager->SetProcessOrdering(theCerenkovProcess,idxPostStep);
    }

-    if (theScintillationProcess->IsApplicable(*particle)) {
-      pmanager->AddProcess(theScintillationProcess);
-      pmanager->SetProcessOrderingToLast(theScintillationProcess, idxAtRest);
-      pmanager->SetProcessOrderingToLast(theScintillationProcess, idxPostStep);
-    }

    if (particleName == "opticalphoton") {
      G4cout << ">>>>>>>>>>>>>> AddDiscreteProcess to OpticalPhoton " << G4endl;
@@ -42,7 +42,9 @@
 //    or through the GeneralParticleSource  messenger class.
 //
 #include "UltraPrimaryGeneratorAction.hh"
+#include "UltraDetectorConstruction.hh"

+#include "G4RunManager.hh"
 #include "G4Event.hh"
 #include "G4GeneralParticleSource.hh"
 #include "G4SPSAngDistribution.hh"
@@ -128,8 +130,39 @@ void UltraPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
    G4cout << particleGun->GetCurrentSource()->GetEneDist()->GetEnergyDisType() << " " ;
    G4cout << particleGun->GetCurrentSource()->GetPosDist()->GetPosDisType()    << G4endl ;

+
+// Check if optical photon wavelength is within limits set for material optical properties tables. 
+
+   
+
+
 }
  particleGun->GeneratePrimaryVertex(anEvent);
+
+    if (particleGun->GetParticleDefinition()->GetParticleName() == "opticalphoton"){
+     
+     	const UltraDetectorConstruction * detector =  
+     	dynamic_cast<const UltraDetectorConstruction *>((G4RunManager::GetRunManager())->GetUserDetectorConstruction()) ;
+
+	G4double lambda_min = detector->GetLambdaMin() ;
+	G4double lambda_max = detector->GetLambdaMax() ;
+
+       	G4double energy = particleGun->GetParticleEnergy() ;
+
+	if (h_Planck*c_light/energy > lambda_max || h_Planck*c_light/energy < lambda_min){
+	       G4cerr << "Error ! Optical photon energy (" << energy/eV << " eV) out of limits set by material optical properties tables. \n" 
+              << "Please check that photon wavelength is within the following interval: [" 
+              << lambda_min/nm << "," 
+              << lambda_max/nm << "] nm" 
+              << ", i.e., ["
+              << h_Planck*c_light/lambda_max/eV << ","
+              << h_Planck*c_light/lambda_min/eV << "] eV"
+              << G4endl ;
+	
+             G4Exception("") ;
+	}
+ }
+
 }


--- a/Show More
+++ b/Show More