Import Geant4 6.1.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -18,9 +18,9 @@
|
||||
# you may fetch it yourself from your nearest archive site.)
|
||||
#
|
||||
|
||||
# $Id: Configure,v 1.48 2003/12/12 15:02:51 stesting Exp $
|
||||
# $Id: Configure,v 1.49 2004/02/09 14:58:45 stesting Exp $
|
||||
#
|
||||
# Generated on Fri Dec 12 15:49:38 CET 2003 [metaconfig 3.0 PL70]
|
||||
# Generated on Mon Feb 9 15:57:09 CET 2004 [metaconfig 3.0 PL70]
|
||||
|
||||
cat >/tmp/c1$$ <<EOF
|
||||
WARNING!!!!!
|
||||
@@ -3101,6 +3101,8 @@ gans=$ans
|
||||
case $gans in
|
||||
|
||||
n*|N*)
|
||||
g4lib_build_shared=n
|
||||
g4lib_build_static=y
|
||||
break
|
||||
;;
|
||||
y*|Y*)
|
||||
@@ -3134,7 +3136,8 @@ You selected to build 'shared' (.so) libraries.
|
||||
Do you want to build 'static' (.a) libraries too?
|
||||
EOM`
|
||||
|
||||
dflt=$g4lib_build_static
|
||||
#dflt=$g4lib_build_static
|
||||
dflt=n
|
||||
rp=$g4message
|
||||
. ./myread
|
||||
gans=$ans
|
||||
@@ -3142,6 +3145,7 @@ gans=$ans
|
||||
case $gans in
|
||||
|
||||
n*|N*)
|
||||
g4lib_build_static=n
|
||||
break
|
||||
;;
|
||||
y*|Y*)
|
||||
|
||||
@@ -0,0 +1,153 @@
|
||||
|
||||
Geant4 6.0 - patch-01 Release Notes
|
||||
-----------------------------------
|
||||
|
||||
11 February 2004
|
||||
|
||||
List of fixes included in this public patch since release 6.0:
|
||||
|
||||
o Configuration:
|
||||
-------------
|
||||
+ Configure:
|
||||
o Corrected defaults for shared-libs build.
|
||||
+ architecture.gmk:
|
||||
o Protect OGLFLAGS against containing include path to /usr/include.
|
||||
This may cause wrong includes to be picked up.
|
||||
+ Darwin-g++.gmk:
|
||||
o Adopt "g++" as the default as compiler.
|
||||
o Corrected procedure for building .dylib shared libs.
|
||||
Previous default Linux commands do not work on MacOSX.
|
||||
|
||||
o Geometry:
|
||||
--------
|
||||
+ magneticfield:
|
||||
o G4UniformMagField: added missing implementation for
|
||||
GetConstantFieldValue(). Fixes bug report #575.
|
||||
+ navigation:
|
||||
o Modified G4PropagatorInField::ReEstimateEndpoint() to cope with
|
||||
a failure of AccurateAdvance(), by calling it iteratively up maximum
|
||||
20 times.
|
||||
o Fix in G4PropagatorInField::SetVerboseLevel(): now forwarding the
|
||||
verbosity to integration driver.
|
||||
+ solids/CSG:
|
||||
o Converted strong exceptions in warning notifications for rare
|
||||
anomalous conditions in DistanceToOut(p,v,..).
|
||||
o G4Cons: bug fix in DistanceToIn(p,v) to resolve situations of calls
|
||||
to DistanceToOut() for points outside.
|
||||
+ solids/specific:
|
||||
o G4PolyhedraSide: fixed bug in which particles could "leak" out the
|
||||
center of a face if inner radius = 0. Fixes problem report #547.
|
||||
+ volumes:
|
||||
o G4AssemblyVolume: fixed initial value for 'numberOfDaughters' of
|
||||
imprinted volumes copy-numbers. Fixes problem report #566.
|
||||
|
||||
o Global:
|
||||
------
|
||||
+ G4UnitsTable: corrected signatures to consider 'const G4String&'
|
||||
wherever applicable.
|
||||
|
||||
o Materials:
|
||||
---------
|
||||
+ G4Material: proper STL handling of 'theElementVector'.
|
||||
+ Fixed problem in destructor of G4SandiaTable.
|
||||
|
||||
o Particles:
|
||||
---------
|
||||
+ Fixed initialization problems in G4NuclearPropertiesTable:
|
||||
o Added initialization of 'indexArray'.
|
||||
o Removed internal static member 'theInstance'.
|
||||
|
||||
o Electromagnetic low-energy processes:
|
||||
------------------------------------
|
||||
+ Fixed memory leaks in G4PenelopeInterpolator and G4PenelopeIonisation.
|
||||
|
||||
o Electromagnetic standard processes:
|
||||
----------------------------------
|
||||
+ standard:
|
||||
o Minor fixes in G4PAIonisation and G4PAIModel.
|
||||
+ utils:
|
||||
o Activated precise range calculation.
|
||||
o Added Set methods to G4LossTablemanager to define: binning,
|
||||
'maxEnergy' for muon tables, 'maxEnergy' for precise range.
|
||||
o Fixed problem in destruction of PAI model.
|
||||
o Fixed bug responsible for problems in cross section of
|
||||
delta-electron production from muons.
|
||||
|
||||
o Hadronic Processes:
|
||||
------------------
|
||||
+ management:
|
||||
o Fix for suspended particles. Solves a problem seen in neutron_hp
|
||||
elastic scattering.
|
||||
+ chiral_inv_phase_space:
|
||||
o Porting of experimental interface classes.
|
||||
o Provided implementation of missing cases which was cause of
|
||||
crashes in ATLAS production.
|
||||
+ neutron_hp:
|
||||
o Fixed conflict with system variable name.
|
||||
+ parton_string:
|
||||
o Lower bound added to transverse mass distribution, to enable
|
||||
diffractive scattering for gammas. Was cause of a crash in ATLAS
|
||||
productions.
|
||||
|
||||
o Optical processes:
|
||||
-----------------
|
||||
+ Fix in the initialization of the G4OpBoundaryProcessStatus at the
|
||||
beginning of its DoIt(), now set to "Undefined". This should allow
|
||||
a user to correctly get the process flag from the UserSteppingAction()
|
||||
through the public function G4OpBoundaryProcess::GetStatus()
|
||||
even when the (forced) DoIt() was called when the optical photon
|
||||
track was not at a boundary, or when medium1 == medium2.
|
||||
|
||||
o Parameterised processes:
|
||||
-----------------------
|
||||
+ G4FastSimulationVector: use std_pvector:: scope for calls to
|
||||
base class. Fixes compilation problem on Intel-icc compiler.
|
||||
|
||||
o Transportation processes:
|
||||
------------------------
|
||||
+ Fixed a bug in G4UserSpecialCuts related to 'charged-geantino'.
|
||||
|
||||
o Run:
|
||||
---
|
||||
+ Updated date to run-manager.
|
||||
|
||||
o Track:
|
||||
-----
|
||||
+ G4VParticleChange: removed unnecessary 'const' qualifier to return
|
||||
value in GetAccuracyForWarning() and GetAccuracyForException()
|
||||
causing noisy compilation warnings on Intel-icc compiler.
|
||||
|
||||
o Visualization:
|
||||
-------------
|
||||
+ management:
|
||||
o Fixed compilation problems on Intel-icc compiler. Added missing
|
||||
forward declaration of G4VisStateDependent to G4VisManager.
|
||||
+ HepRep:
|
||||
o Fixed handling of symbols zcalloc and zcfree of the zlib library
|
||||
being called as C++ mangled names.
|
||||
o Renamed zutil.h, zlib.h and zconf.h into HepRep-zutil.h, ... to
|
||||
avoid conflicts with those files on Unix systems if /usr/include
|
||||
or /usr/local/include is on the include search path.
|
||||
o Fixed compilation problems on Intel-icc compiler.
|
||||
|
||||
o Examples:
|
||||
--------
|
||||
+ Updated reference outputs.
|
||||
+ extended/analysis/A01
|
||||
o Fixed physics lists for EM processes.
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
|
||||
Technical Notes
|
||||
---------------
|
||||
|
||||
o This patch should be applied on top of release 6.0.
|
||||
o Technical notes distributed for release 6.0 are also applicable and
|
||||
valid for this patch.
|
||||
|
||||
The code and rebuilt binary libraries for release 6.0 are available through
|
||||
our "Source Code" Web page: http://cern.ch/geant4
|
||||
|
||||
Please refer to the Geant4 User Documentation:
|
||||
http://cern.ch/geant4/G4UsersDocuments/Overview/html
|
||||
for further information about using Geant4.
|
||||
@@ -201,14 +201,14 @@ We believe none give rise to incorrect behaviour.
|
||||
its mother physical volume during the navigation, it is now required to
|
||||
adopt <I>touchables</I> through the pre/post-step point.<BR>
|
||||
Examples on how to do this are provided in the
|
||||
<A TARGET="ext" HREF="http://cern.ch/geant4/support/faq.html#a-geom-3">FAQ page</A></LI>
|
||||
<A TARGET="ext" HREF="http://geant4.web.cern.ch/geant4/support/faq.html#a-geom-3">FAQ page</A></LI>
|
||||
<LI>Inherited user-defined physical volumes will have to adapt to the
|
||||
new interface by removing the method <TT>Setup()</TT>, now no longer
|
||||
required.</LI>
|
||||
<LI>A revision of methods in <TT>G4Navigator</TT> has taken place, some
|
||||
obsolete methods not used and available in the public interface have been
|
||||
removed, others originally meant for internal use have been moved
|
||||
to <TT>protected</TT> (see <A HREF=#geo-notes">notes</A> for details).<BR>
|
||||
to <TT>protected</TT> (see <A HREF="#geo-notes">notes</A> for details).<BR>
|
||||
<TT>LocateGlobalPointAndSetup(p,v,history)</TT> has been renamed to
|
||||
<TT>ResetHistoryAndLocate(p,v,history)</TT>.</LI>
|
||||
<LI>A revision of the inclusion of header files has been done in all
|
||||
@@ -219,7 +219,7 @@ We believe none give rise to incorrect behaviour.
|
||||
<LI>Internal modules in the geometry have been reorganised. External
|
||||
frameworks taking into account the internal structure of the Geant4
|
||||
modules will have to be adapted to the new configuration (see
|
||||
<A HREF=#geo-notes">notes</A> for the details).</LI>
|
||||
<A HREF="#geo-notes">notes</A> for the details).</LI>
|
||||
</UL>
|
||||
|
||||
<P> </P>
|
||||
|
||||
@@ -0,0 +1,520 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE>Geant4 6.1 Release Notes</TITLE>
|
||||
</HEAD>
|
||||
<BODY BGCOLOR='F0F0F0'>
|
||||
|
||||
<P> </P>
|
||||
<BR>
|
||||
<P> </P>
|
||||
|
||||
<P ALIGN="Center">
|
||||
<FONT SIZE="+4" COLOR="#238E23">
|
||||
<B>Geant4 6.1 Release Notes</B>
|
||||
</FONT>
|
||||
|
||||
<TABLE WIDTH="100%">
|
||||
<TR><TD ALIGN="Right">
|
||||
<FONT SIZE="-1" COLOR="#5C3317">
|
||||
<B><I>March 25<SUP>th</SUP>, 2004</I></B>
|
||||
</FONT>
|
||||
</TD></TR>
|
||||
</TABLE>
|
||||
|
||||
<BR><BR>
|
||||
<HR ALIGN="Center" SIZE="7%">
|
||||
<P>
|
||||
The code and binary libraries for the supported systems are available
|
||||
through our <A TARGET="ext" HREF="http://cern.ch/geant4">Source Code Web page</A>.
|
||||
</P>
|
||||
<P>
|
||||
Please refer to the
|
||||
<A TARGET="ext" HREF="http://cern.ch/geant4/G4UsersDocuments/Overview/html">Geant4
|
||||
User Documentation</A> for further information about using Geant4.
|
||||
</P>
|
||||
|
||||
<H2><I>Contents</I></H2>
|
||||
<OL>
|
||||
<LI><A HREF="#1.">Supported and Tested Platforms</A></LI>
|
||||
<LI><A HREF="#2.">AIDA and CLHEP</A></LI>
|
||||
<LI><A HREF="#3.">Compiler Specific Problems</A></LI>
|
||||
<LI><A HREF="#4.">Known Run-Time Problems</A></LI>
|
||||
<LI><A HREF="#5.">Compilation Warnings</A></LI>
|
||||
<LI><A HREF="#6.">Known Run-Time Warnings</A></LI>
|
||||
<LI><A HREF="#7.">Major items for migration of user code</A></LI>
|
||||
<LI><A HREF="#8.">Detailed list of changes and fixes</A></LI>
|
||||
</OL>
|
||||
|
||||
<P> </P>
|
||||
<A NAME="1."></a>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>1. Supported and Tested Platforms</H2>
|
||||
|
||||
Official platforms:
|
||||
<UL>
|
||||
<LI>SUN Solaris 5.8, C++ CC-5.4 Patch 111715-02.</LI>
|
||||
<LI>Linux, gcc 2.95.2, gcc 3.2.<BR>
|
||||
This configuration was tested with the RedHat 7.3 distribution,
|
||||
versions of Geant4 have also been compiled successfully on other
|
||||
Linux distributions, like Debian, Suse or more recent RedHat systems.
|
||||
The default RedHat compiler gcc-2.96 distributed in RedHat 7.X is NOT
|
||||
supported. It has been verified that it produces incorrect binaries,
|
||||
therefore is not reliable. See also <A HREF="#note-1">note below</A>.</LI>
|
||||
<LI>Windows/2000 and CygWin Tools with: Visual C++ 6.0 Service Pack 5</LI>
|
||||
</UL>
|
||||
|
||||
More verified configurations:
|
||||
<UL>
|
||||
<LI>SUN Solaris 5.8, C++ CC-5.5.</LI>
|
||||
<LI>Linux, gcc 3.3.3.</LI>
|
||||
<LI>Linux, Intel-icc 8.0.</LI>
|
||||
<LI>MacOS 10.3, gcc-3.3</LI>
|
||||
<LI>Windows/XP and CygWin Tools, .NET Visual Studio 2003 C++ 7.1</LI>
|
||||
</UL>
|
||||
|
||||
Platforms configured but not tested and not supported:
|
||||
<UL>
|
||||
<LI>AIX 4.3.2, xlC 6.0</LI>
|
||||
<LI>DEC V4.0, cxx C++ V6.1-027</LI>
|
||||
<LI>HP 10.20, aCC C++ B3910B A.01.23</LI>
|
||||
<LI>SGI V6.5.5, CC 7.2.1</LI>
|
||||
</UL>
|
||||
|
||||
<P> </P>
|
||||
<A NAME="2."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>2. AIDA and CLHEP</H2>
|
||||
|
||||
Geant4 6.1 requires the <A TARGET="ext"
|
||||
HREF="http://cern.ch/clhep/INSTALLATION/clhep.html">installation
|
||||
of CLHEP</A>.<BR>
|
||||
Tests have been performed with <B>CLHEP-1.8.1.0</B>.
|
||||
<P> </P>
|
||||
Geant4 6.1 examples with histogramming cowork with AIDA 3
|
||||
implementations. These include:
|
||||
<UL>
|
||||
<LI><A TARGET="ext" HREF="http://cern.ch/anaphe">ANAPHE</A> and included components</LI>
|
||||
<LI><A TARGET="ext" HREF="http://jas.freehep.org">JAS (Java Analysis Studio)</A></LI>
|
||||
<LI><A TARGET="ext" HREF="http://www.lal.in2p3.fr/OpenScientist">Open Scientist</A></LI>
|
||||
</UL>
|
||||
|
||||
AIDA headers can be downloaded from:
|
||||
<A TARGET="ext" HREF="http://aida.freehep.org">http://aida.freehep.org</A>
|
||||
|
||||
|
||||
<P> </P>
|
||||
<A NAME="3."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>3. Compiler Specific Problems</H2>
|
||||
|
||||
<UL>
|
||||
<LI><A NAME="note-1"><B>Linux Red Hat 7.X, gcc-2.96</B></A>.
|
||||
<UL>
|
||||
<LI>The default compiler distributed by Red Hat since release 7.0 is
|
||||
NOT supported and not considered reliable for running a Geant4-based
|
||||
application. In more than one test case, binaries produced by gcc-2.96
|
||||
have shown incorrect behavior, either due to wrong order of
|
||||
initialisation of static data in memory or to bugs in the system
|
||||
<TT>iostream</TT> classes, problems which apparently have all been
|
||||
solved in more recent versions of the compiler (3.X series).<BR>
|
||||
For information, gcc-2.96 is a compiler that has never been
|
||||
officially released, nor supported by the GNU team itself and is not
|
||||
considered reliable by the authors (for more information, see also
|
||||
<A TARGET="ext" HREF="http://gcc.gnu.org/gcc-2.96.html">http://gcc.gnu.org/gcc-2.96.html</A>).</LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<P> </P>
|
||||
<A NAME="4."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>4. Known Run-Time Problems and Limitations</H2>
|
||||
|
||||
For a complete list of outstanding run-time problems and to submit any
|
||||
problem you may find running this version of Geant4, please refer to the
|
||||
<A TARGET="ext" HREF="http://cern.ch/geant4/problemreport">Geant4 Problem Reporting
|
||||
System</A>.
|
||||
|
||||
|
||||
<P> </P>
|
||||
<A NAME="5."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>5. Compilation Warnings</H2>
|
||||
|
||||
There may be compilation warnings on some platforms. We do not believe
|
||||
that any will lead to incorrect run-time behaviour.
|
||||
|
||||
|
||||
<P> </P>
|
||||
<A NAME="6."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>6. Known Run-Time Warnings</H2>
|
||||
|
||||
The following messages can be written to error output while tracking.
|
||||
We believe none give rise to incorrect behaviour.
|
||||
<PRE>
|
||||
G4PropagateInField: Warning: Particle is looping
|
||||
- tracking in field will be stopped.
|
||||
It has performed 1000 steps in Field while a maximum of 1000
|
||||
are allowed.
|
||||
</PRE>
|
||||
|
||||
|
||||
<P> </P>
|
||||
<A NAME="7."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>7. Major items for migration of user code</H2>
|
||||
|
||||
There not known migrations necessary if upgrading from release 6.0,
|
||||
other than recompilation and/or reinstallation of libraries and user
|
||||
applications.
|
||||
|
||||
<P> </P>
|
||||
<A NAME="8."></A>
|
||||
<HR>
|
||||
|
||||
<!-- ============================================== -->
|
||||
|
||||
<H2>8. Detailed list of changes and fixes</H2>
|
||||
|
||||
These are the main new features/fixes included in this release since the
|
||||
last patched public release (for the detailed list of fixes/additions,
|
||||
please refer to the related History files provided in most packages):
|
||||
|
||||
<P> </P>
|
||||
|
||||
<A NAME="conf-notes">
|
||||
<H3><I>Configuration</I></H3></A>
|
||||
<UL>
|
||||
<LI>Fixes in the experimental configuration file <TT>Linux-icc.gmk</TT>
|
||||
for Intel/icc compiler on Linux systems.</LI>
|
||||
<LI><TT>WIN32-VC7.gmk</TT>: added material to build shared-libs for
|
||||
Windows (DLLs), for future use.<BR>
|
||||
Added program <TT>win32def.c</TT> to help building DLLs, for
|
||||
future use.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="dgt-notes">
|
||||
<H3><I>Digitization & Hits</I></H3></A>
|
||||
<UL>
|
||||
<LI>Added methods to <TT>G4HCtable</TT> for additional verbosity.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="evt-notes">
|
||||
<H3><I>Event</I></H3></A>
|
||||
<UL>
|
||||
<LI><TT>LocateGlobalPointAndSetup()</TT> method of <TT>G4Navigator</TT>
|
||||
is now invoked at the beginning of each new event to reset the
|
||||
navigation history.</LI>
|
||||
<LI>Bug Fix in the destructor of <TT>G4ParticleGunMessenger</TT>.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="emlow-notes">
|
||||
<H3><I>Electromagnetic Processes (Low-energy)</I></H3></A>
|
||||
<UL>
|
||||
<LI>Implemented optimization of Bremsstrahlung angular generators.</LI>
|
||||
<LI>Bug fixes in <TT>G4IonisationParameters</TT>, <TT>G4PenelopeCompton</TT>
|
||||
and <TT>G4PenelopeIonisation</TT>.</LI>
|
||||
<LI>Fixed some compilation warnings on Intel/icc compiler.</LI>
|
||||
<LI>Bug fix in <TT>G4PenelopeRayleigh</TT>, related to problem report #605.</LI>
|
||||
<LI>Performance improvement in <TT>G4Generator2BN</TT> and Penelope
|
||||
processes.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="emstd-notes">
|
||||
<H3><I>Electromagnetic Processes (Standard)</I></H3></A>
|
||||
<UL>
|
||||
<LI>Bug Fixes in model variant of multiple-scattering; simplified calculation
|
||||
of energy dependence of internal parameters.<BR>
|
||||
<TT>G4MscModel</TT>: corrections to path length conversion and theta angle.</LI>
|
||||
<LI>Updated parameterizations in G4MuPairProductionModel for energies
|
||||
over ~100 GeV. Precision of differential cross section parameterization is
|
||||
improved from 30% to 5%.</LI>
|
||||
<LI>Updated radiative corrections calculation for <TT>G4MuBetheBlochModel</TT>
|
||||
for muon energy above 1 GeV. Accuracy of energy loss of high energy muons
|
||||
updated from 10% to 2%.</LI>
|
||||
<LI>Fixed problem of ionisation in air with low pressure less than
|
||||
<TT>10<SUP>-4</SUP> Atm</TT>. Setting <TT>lowestKinEnergy</TT> to <TT>1.*eV</TT>,
|
||||
in <TT>G4VEnergyLossProcess</TT>.</LI>
|
||||
<LI>Fixed problem of simulation of fluctuation of energy losses in very
|
||||
small steps.</LI>
|
||||
<LI>Activated new optional feature, <I>PreciseRange</I> option, which
|
||||
provides ranges of particles calculated from total (not-truncated
|
||||
by cut) energy loss. Relevant for energies less than <TT>1 MeV</TT>
|
||||
and effect sampling calorimeter results.</LI>
|
||||
<LI>Added new class <TT>G4EmProcessOptions</TT> to be used in physics lists.
|
||||
<LI>Fixes in constructor of discrete processes for setting of process type.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="gen-notes">
|
||||
<H3><I>General Processes, Parameterisation, Cuts, Decay, Optical</I></H3></A>
|
||||
<UL>
|
||||
<LI><B>Decay</B>:
|
||||
<UL>
|
||||
<LI>Fixed bug in <TT>PostStepGPIL()</TT> in case of stopping
|
||||
during AlongStep actions.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>Optical</B>:
|
||||
<UL>
|
||||
<LI><TT>G4OpBoundaryProcess</TT>:
|
||||
<UL>
|
||||
<LI>Added process status <TT>NotAtBoundary</TT>, <TT>SameMaterial</TT>,
|
||||
<TT>StepTooSmall</TT>, <TT>NoRINDEX</TT>. Allowing for a
|
||||
skin-surface between mother and daughter volumes, with the
|
||||
daughter skin taking precedence.</LI>
|
||||
<LI>Initialise all class members in constructor.</LI>
|
||||
</UL></LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="geo-notes">
|
||||
<H3><I>Geometry</I></H3></A>
|
||||
<UL>
|
||||
<LI><B>Navigation</B>
|
||||
<UL>
|
||||
<LI><TT>G4Navigator</TT>: fixed old outstanding bug in
|
||||
<TT>ComputeStep()</TT> for the location of the local point in
|
||||
the calculation of a valid exit normal.</LI>
|
||||
<LI>Added <I>check_mode</I> state for navigators. The state can be
|
||||
activated by a new UI command
|
||||
(<TT>geometry/navigator/check_mode [true/false]</TT>) and will
|
||||
force more strict and less tolerant checks in step/safety computation
|
||||
to verify the correctness of solids' response in the geometry.</LI>
|
||||
<LI>Reorganised verbosity levels. Added more useful information activated
|
||||
when in <TT>G4VERBOSE</TT> mode and verbosity level selected.<BR>
|
||||
Fixed output formatting when entering/exiting verbose blocks.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>Solids</B>
|
||||
<UL>
|
||||
<LI><I>Boolean solids</I>:
|
||||
<UL>
|
||||
<LI><TT>G4UnionSolid</TT>, <TT>G4SubtractionSolid</TT>: fix in debug
|
||||
printout for <TT>SurfaceNomal()</TT>.</LI>
|
||||
</UL></LI>
|
||||
<LI><I>CSG solids</I>:
|
||||
<UL>
|
||||
<LI><TT>G4Torus</TT>: fixed bug in <TT>Inside(p)</TT>, fixing warnings
|
||||
of '<TT>point p is outside</TT>' observed when running in
|
||||
debug-mode.</LI>
|
||||
</UL></LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="glob-notes">
|
||||
<H3><I>Global</I></H3></A>
|
||||
<UL>
|
||||
<LI>Removed obsolete "<TT>includes</TT>" target in <TT>management/GNUmakefile</TT>.</LI>
|
||||
<LI>Corrected comments in <TT>G4UserLimits</TT> header.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="had-notes">
|
||||
<H3><I>Hadronic Processes</I></H3></A>
|
||||
<UL>
|
||||
<LI><B>management & utils</B>
|
||||
<UL>
|
||||
<LI>Added a white-board functionality to allow for in-core inspection
|
||||
of reaction conditions in optimized.</LI>
|
||||
<LI>Added a signal-handler (for SIGSEGV) that prints the reaction
|
||||
conditions before handling it over to the experiment (or default)
|
||||
signal handler.</LI>
|
||||
<LI>Fixed cases of double deletion of memory in cases when
|
||||
isotope-production models are used.</LI>
|
||||
<LI>Run-time checking for <TT>NaN</TT> values of energies of
|
||||
secondaries.</LI>
|
||||
<LI>Fix for suspended particles (only neutron_hp model has these).</LI>
|
||||
<LI>Rudimentary verification of consistancy of hadronic physics.</LI>
|
||||
<LI>Transition to <TT>std::pair</TT> in <TT>G4Pair</TT>.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>models/binary_cascade</B>
|
||||
<UL>
|
||||
<LI>Fixed a few memory leaks in <TT>G4BinaryLightIonReaction</TT>.</LI>
|
||||
<LI>Fix for single nucleon spectator, resulting in occasional
|
||||
momentum non-conservation.</LI>
|
||||
<LI>Removed one recurring run time warning from <TT>G4RKPropagation</TT>.
|
||||
Relates to problem report #593.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>models/chiral_inv_phase_space</B>
|
||||
<UL>
|
||||
<LI>Major improvement of the CHIPS nuclear fragmentation model: in
|
||||
addition to Lambdas, now Sigmas, Xi, and Omega hyperons are added to
|
||||
the fragmentation algorithm (together with N+Sigma and NN+Sigma nuclear
|
||||
fragments); Delta isobars together with iso-nuclei are implemented
|
||||
as an intermediate states of fragmentation; all leptons are added to
|
||||
the CHIPSWorld of particles, so that now the CHIPS model is ready for
|
||||
nuclear muon-minus capture at rest process and for the neutrino-nuclear
|
||||
reactions.</LI>
|
||||
<LI>Implemented new debug system of step by step energy/momentum and
|
||||
charge/baryon_number conservation control.</LI>
|
||||
<LI>Resolved en/mom conflicts in the Sigma+Delta++ and Sigma-Delta-
|
||||
final states.</LI>
|
||||
<LI>Corrected baryon number and charge non conservation observed in some
|
||||
decays.</lI>
|
||||
<LI>Cleared unnecessary run-time warnings, for which it was tested that
|
||||
the conflict situation is successfully resolved.</LI>
|
||||
<LI>Fixed bug for Delta-,Delta-,n under 3n+2pi- together with all possible
|
||||
Delta-Delta-,(k*n) under (k+2)*n+2pi- threshold and Delta++,Delta++,
|
||||
(k*p) under (k+2)*p+2pi+ threshold possible fragmentation states.</LI>
|
||||
<LI>Bug fixes and porting in the interface classses.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>models/im_r_matrix</B>
|
||||
<UL>
|
||||
<LI>Improved configuration and configurability, using TMPs.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>models/leading_particle</B>
|
||||
<UL>
|
||||
<LI>Added constructor message, specifying what code is used.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>models/neutron_hp</B>
|
||||
<UL>
|
||||
<LI>Bug fix concerning Mandrake/Linux (CSTOP enum replaced).</LI>
|
||||
<LI>Fixed Valgrind run-time error on <TT>G4NeutronHPVector</TT>.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>models/qgsm</B>
|
||||
<UL>
|
||||
<LI>Introduced minimal transverse mass for diffractive
|
||||
scattering of gammas.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>stopping</B>
|
||||
<UL>
|
||||
<LI>Updated implementation of mu-nuclear absorption at rest.</LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="part-notes">
|
||||
<H3><I>Particles</I></H3></A>
|
||||
<UL>
|
||||
<LI>Updated mass and width to meet with PDG 2002 data.</LI>
|
||||
<LI>Added classes for retrieving particle properties from file:
|
||||
<UL>
|
||||
<LI>Base class <TT>G4VParticlePropertyRetriever</TT>.</LI>
|
||||
<LI>Classes <TT>G4TextPPReporter</TT> and <TT>G4TextPPRetriever</TT>.</LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="readout-notes">
|
||||
<H3><I>Readout</I></H3></A>
|
||||
<UL>
|
||||
<LI>Added some methods in <TT>G4DCtable</TT> to enhance a verbosity.</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="run-notes">
|
||||
<H3><I>Run, Intercoms and Interfaces</I></H3></A>
|
||||
<UL>
|
||||
<LI><TT>G4RunManager</TT>:
|
||||
<UL>
|
||||
<LI>Invocation of <TT>G4Navigator::LocateGlobalPointAndSetup()</TT> is now
|
||||
moved to <TT>G4EventManager</TT> so that the navigation history is
|
||||
reset for every new event.</LI>
|
||||
<LI>Added reference and WWW information to run-time header.</LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="vis-notes">
|
||||
<H3><I>Visualization</I></H3></A>
|
||||
<UL>
|
||||
<LI><B>HepRep</B>
|
||||
<UL>
|
||||
<LI>HepRepFile handle duplicate <TT>ShowView</TT>.</LI>
|
||||
<LI>HepRepFile improve layering and hierarchy for hits.</LI>
|
||||
<LI>Fixed compilation warnings for the Linux-icc (8.0) compiler.</LI>
|
||||
<LI>Removed appendzip.cc file, not strictly necessary.
|
||||
Fixes problem report #570.</LI>
|
||||
<LI>Renamed the HepRep schema locator to new web URL.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>OpenGL</B>
|
||||
<UL>
|
||||
<LI>Fixed wrong order of statements in <TT>G4OpenGLXViewer</TT>
|
||||
destructor. Fixes bug report #581.</LI>
|
||||
</UL></LI>
|
||||
<LI><B>management</B>
|
||||
<UL>
|
||||
<LI>Added checks and minor improvement of behaviour at end of event
|
||||
and run.</LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="hlst-notes">
|
||||
<H3><I>Hadronic physics-lists</I></H3></A>
|
||||
<UL>
|
||||
<LI>Updates to package 4.1 (QGSP_BIC, QGSP_BERT).</LI>
|
||||
</UL>
|
||||
|
||||
<A NAME="ex-notes">
|
||||
<H3><I>Examples</I></H3></A>
|
||||
<UL>
|
||||
<LI>Updated reference outputs.</LI>
|
||||
<LI><B>advanced</B>
|
||||
<UL>
|
||||
<LI><I>brachytherapy</I>
|
||||
<UL>
|
||||
<LI>Added a new histogram and some code cleanup.</LI>
|
||||
</UL></LI>
|
||||
<LI><I>composite_calorimeter</I>
|
||||
<UL>
|
||||
<LI>Removed redefinition of streaming operator for
|
||||
<TT>G4LorentzVector</TT> in <TT>CCalRotationMatrixFactory</TT>,
|
||||
causing compilation problems on some compiler/system
|
||||
configurations.</LI>
|
||||
</UL></LI>
|
||||
<LI><I>Rich</I>
|
||||
<UL>
|
||||
<LI>Fixed compilation errors and warnings for gcc-3.2.</LI>
|
||||
</UL></LI>
|
||||
</UL></LI>
|
||||
<LI><B>extended</B>
|
||||
<UL>
|
||||
<LI><I>biasing/B01</I>
|
||||
<UL>
|
||||
<LI>Open the geometry to cleanly clear biasing stores
|
||||
at the end of the application.</LI>
|
||||
</UL></LI>
|
||||
<LI><I>electromagnetic/TestEm5</I>
|
||||
<UL>
|
||||
<LI>Modified histo 7: projected position at exit.</LI>
|
||||
<LI>RunAction: removed UI commands for visualisation,
|
||||
added a function <TT>ComputeMscHighland()</TT>.</LI>
|
||||
</UL></LI>
|
||||
<LI><I>field</I>
|
||||
<UL>
|
||||
<LI>Fixed methods that change the field to update the equation and
|
||||
field-manager in field01 and field03.</LI>
|
||||
</UL></LI>
|
||||
<LI><I>medical/DICOM</I>
|
||||
<UL>
|
||||
<LI>Added History file, changed README.</LI>
|
||||
</UL></LI>
|
||||
</UL></LI>
|
||||
<LI><B>novice</B>
|
||||
<UL>
|
||||
<LI><I>N06</I>
|
||||
<UL>
|
||||
<LI>DetectorConstruction: changed surface model between
|
||||
<TT>OpWaterSurface</TT> and <TT>OpAirSurface</TT>.</LI>
|
||||
</UL></LI>
|
||||
</UL></LI>
|
||||
</UL>
|
||||
|
||||
<HR>
|
||||
|
||||
</BODY>
|
||||
</HTML>
|
||||
+29
-2
@@ -1,5 +1,5 @@
|
||||
$Id: History,v 1.231 2003/11/18 09:08:10 gcosmo Exp $
|
||||
$Name: geant4-06-00 $
|
||||
$Id: History,v 1.238 2004/02/24 09:49:45 gcosmo Exp $
|
||||
$Name: geant4-06-01 $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,33 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
24th February 2004 Gabriele Cosmo (config-V06-00-03)
|
||||
- Fixed link rpath definition in Linux-icc.gmk.
|
||||
|
||||
11th February 2004 Gabriele Cosmo (config-V06-00-02)
|
||||
- Added configuration file Linux-icc.gmk for Intel/icc compiler
|
||||
on Linux systems.
|
||||
|
||||
10th February 2004 Guy Barrand
|
||||
- WIN32-VC7.gmk: added material to build shared libs for Windows (DLLs).
|
||||
- Added program win32def.c to help building DLLs, built from
|
||||
source/GNUmakefile through a specialised target and placed in
|
||||
$G4LIB/$G4SYSTEM.
|
||||
- source/materials/GNUmakefile: modified to provide an example of macro
|
||||
GLOBLIBS used by the DLL builder in order to have global lib dependencies.
|
||||
|
||||
9th February 2004 Gunter Folger (config-V06-00-01)
|
||||
- architecture.gmk:
|
||||
o Protect OGLFLAGS against containing -I/usr/include; this may cause
|
||||
wrong includes to be picked up.
|
||||
|
||||
26th January 2004 Guy Barrand (config-V06-00-00)
|
||||
- Darwin-g++.gmk:
|
||||
o Use "g++" as a default compiler (in order to take the MacOSX
|
||||
default compiler).
|
||||
o Corrected procedure for building .dylib shared libs.
|
||||
Previous default Linux commands do not work on MacOSX.
|
||||
|
||||
18th November 2003 Gabriele Cosmo (config-V05-02-05)
|
||||
- Updated binmake.gmk to include new hadronics modules.
|
||||
Coworks with "ghad-V05-02-00" and HEAD of processes/GNUmakefile.
|
||||
|
||||
+10
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.90 2003/10/17 10:17:11 gbarrand Exp $
|
||||
# $Id: architecture.gmk,v 1.91 2004/02/09 15:22:49 gunter Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -260,6 +260,15 @@ GREP := grep
|
||||
#
|
||||
include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk
|
||||
|
||||
# make certain that OGLFLAGS does NOT contain -I/usr/include
|
||||
# caused by OGLHOME being /usr, as e.g. on Linux
|
||||
#
|
||||
ifdef OGLFLAGS
|
||||
OGLFLAGS:= $(filter-out -I/usr/include,$(OGLFLAGS))
|
||||
OGLFLAGS:= $(filter-out -I/usr//include,$(OGLFLAGS))
|
||||
endif
|
||||
|
||||
|
||||
# If there is no cbrt() function...
|
||||
#
|
||||
ifdef G4_NO_CBRT
|
||||
|
||||
+15
-12
@@ -3,15 +3,19 @@
|
||||
#
|
||||
# MacOS 10.1 GNU-gcc 2.92.2
|
||||
# MacOS 10.2 there is g++2 and g++3, choose consistently one,
|
||||
# like g++2 which is 2.95.2
|
||||
# use echo -n (there is not the echo -e option of Linux)
|
||||
# like g++2 which is 2.95.2, g++3 for 3.X.
|
||||
# MacOS 10.3 use default MacOS-X compiler (g++) as the default.
|
||||
# Have commands to build the .dylib (MacOS-X shared libs)
|
||||
#
|
||||
# Helmut Burkhardt - CERN
|
||||
# Use echo -n (there is not the 'echo -e' option of Linux)
|
||||
#
|
||||
# Author: Helmut Burkhardt - CERN
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
# choice of GNU compilers:
|
||||
CXX := g++2
|
||||
# CXX := g++3
|
||||
# choice of compiler (take, as default, the MacOS default) :
|
||||
# CXX := g++2
|
||||
# CXX := g++3
|
||||
CXX := g++
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe
|
||||
# optionally add verbose flag
|
||||
# CXXFLAGS += -v
|
||||
@@ -36,12 +40,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
# G4RUNPATHOPTION := -Wl,-rpath
|
||||
FC := g77
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
FCLIBS := -lg2c -lnsl
|
||||
ECHO := /bin/echo -n
|
||||
SHEXT := so
|
||||
SHEXT := dylib
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
@@ -60,13 +64,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o
|
||||
g++ -dynamiclib -flat_namespace -undefined suppress -o $$libdir/$(@F) $(INTYLIBS) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
g++ -dynamiclib -flat_namespace -undefined suppress -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ !!! not supported !!!
|
||||
# Intel icc 8.0
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -mp -no-gcc -w1
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
CCFLAGS := -O
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
ifdef G4PROFILE
|
||||
CXXFLAGS += -qp
|
||||
FCFLAGS += -qp
|
||||
CCFLAGS += -pg
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Xlinker -rpath
|
||||
CC := gcc
|
||||
FC := g77
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
FCLIBS := -lg2c -lnsl
|
||||
AR := xiar r
|
||||
ECHO := /bin/echo -e
|
||||
SHEXT := so
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
XMLIBS := -lXm -lXpm
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
endif
|
||||
@@ -15,6 +15,7 @@ ifeq ($(G4SYSTEM),WIN32-VC7)
|
||||
CPPFLAGS += -DWIN32 -DXPNET
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
SHEXT := dll
|
||||
AR := LIB
|
||||
ECHO := echo -e
|
||||
FC := g77
|
||||
@@ -29,11 +30,63 @@ ifeq ($(G4SYSTEM),WIN32-VC7)
|
||||
UI32LIBS := gdi32.lib user32.lib
|
||||
endif
|
||||
|
||||
#
|
||||
# Building DLLs (from G.Barrand)
|
||||
# -------------
|
||||
# The below commands permit to build DLLs from the archive libraries.
|
||||
# From a libG4xxx.a, it will extract the symbols with :
|
||||
# DOS> dumpbin /symbols libG4xxx.a > G4xxx.dumpbin
|
||||
# After that it will produce a G4xxx.def using the 'win32def' program.
|
||||
# The G4xxx.def file will contain the list of symbols that are "exported"
|
||||
# or made public for using the DLLs.
|
||||
# The source win32def.c is in config/sys. The binary is built during the
|
||||
# library installation process, and will be placed in $G4LIB/G4SYSTEM.
|
||||
# If can also be built as follows :
|
||||
# DOS> cl.exe /Fowin32def.exe win32def.c
|
||||
# Then, to use it :
|
||||
# DOS> win32def G4xxx < G4xxx.dumpbin > G4xxx.def
|
||||
# Libraries libG4xxx.lib can also be built with :
|
||||
# DOS> lib /def:G4xxx.def /out:libG4xxx.lib
|
||||
# It also produces a libG4xxx.exp used to build the DLL.
|
||||
# The DLL can be built with :
|
||||
# DOS> link /dll /out:G4xxx.dll libG4xxx.exp libG4xxx.a <dependencies>
|
||||
# Note that a DLL must be fully linked. You should NOT have undefined
|
||||
# symbols as output of the link command.
|
||||
#
|
||||
define build-granular-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
@libdir=`(cd $(@D);/bin/pwd)`;\
|
||||
cd $(G4TMP)/$(G4SYSTEM);\
|
||||
echo "Building $(name).dumpbin file";\
|
||||
$(RM) $(name).dumpbin;\
|
||||
dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
|
||||
echo "Building $(name).def file";\
|
||||
$(RM) $(name).def;\
|
||||
$(G4LIBDIR)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
|
||||
$(RM) $(name).dumpbin;\
|
||||
echo "Building lib$(name).exp and lib$(name).lib file";\
|
||||
$(RM) $(G4LIBDIR)/lib$(name).exp;\
|
||||
$(RM) $(G4LIBDIR)/lib$(name).lib;\
|
||||
lib.exe /nologo /machine:ix86 /def:$(name).def /out:$(G4LIBDIR)/lib$(name).lib;\
|
||||
$(RM) $(G4LIBDIR)/$(name).dll;\
|
||||
echo "Building $(name).dll file";\
|
||||
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a /libpath:$(G4LIBDIR) $(GLOBLIBS) $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB)
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
@libdir=`(cd $(@D);/bin/pwd)`;\
|
||||
cd $(G4TMP)/$(G4SYSTEM);\
|
||||
echo "Building $(name).dumpbin file";\
|
||||
$(RM) $(name).dumpbin;\
|
||||
dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
|
||||
echo "Building $(name).def file";\
|
||||
$(RM) $(name).def;\
|
||||
$(G4LIBDIR)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
|
||||
$(RM) $(name).dumpbin;\
|
||||
echo "Building lib$(name).exp and lib$(name).lib file";\
|
||||
$(RM) $(G4LIBDIR)/lib$(name).exp;\
|
||||
$(RM) $(G4LIBDIR)/lib$(name).lib;\
|
||||
lib.exe /nologo /machine:ix86 /def:$(name).def /out:$(G4LIBDIR)/lib$(name).lib;\
|
||||
$(RM) $(G4LIBDIR)/$(name).dll;\
|
||||
echo "Building $(name).dll file";\
|
||||
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a /libpath:$(G4LIBDIR) $(GLOBLIBS) $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB)
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,170 @@
|
||||
/* $Id: win32def.c,v 1.2 2004/02/09 16:44:45 gcosmo Exp $ */
|
||||
/* +---------------------- Copyright notice -------------------------------+ */
|
||||
/* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */
|
||||
/* | Permission to use, copy, modify, and distribute this software | */
|
||||
/* | and its documentation for any purpose and without fee is hereby | */
|
||||
/* | granted, provided that the above copyright notice appear in all | */
|
||||
/* | copies and that both that copyright notice and this permission | */
|
||||
/* | notice appear in supporting documentation. This software is | */
|
||||
/* | provided "as is" without express or implied warranty. | */
|
||||
/* +---------------------- Copyright notice -------------------------------+ */
|
||||
|
||||
/*
|
||||
This program is a tool to build .def file
|
||||
used by lib.exe to build the DLL on Windows.
|
||||
It takes the output of a "dumpbin" over an
|
||||
archive library and produces the .def file for
|
||||
this library. For example :
|
||||
DOS> dumpbin /out:tmp /symbols MyLib.arc
|
||||
DOS> win32def.exe MyLib < tmp > MyLib.def
|
||||
Note that win32def is a standalone program that
|
||||
can be easily reconstructed with :
|
||||
DOS> cl /Fowin32def.exe win32def.c
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
char** GetWords (char*,char*,int*);
|
||||
/*****************************************************************************/
|
||||
int main (
|
||||
int aArgn
|
||||
,char** aArgs
|
||||
)
|
||||
/*****************************************************************************/
|
||||
{
|
||||
#define MAX_STRING 2048
|
||||
char buffer[MAX_STRING+1];
|
||||
int length;
|
||||
|
||||
|
||||
/*EXETYPE WINDOWS\n\ */
|
||||
printf("\
|
||||
LIBRARY %s\n\
|
||||
EXPORTS\n",aArgs[1]);
|
||||
|
||||
while(1){
|
||||
if(fgets(buffer,MAX_STRING,stdin)==NULL) return EXIT_FAILURE;
|
||||
/*
|
||||
On some system (NT) editors when saving binary files
|
||||
put \r\n at place of \n ; we then look for \r\n.
|
||||
*/
|
||||
length = strlen(buffer);
|
||||
if( (length>=2) && (buffer[length-2]=='\r') && (buffer[length-1]=='\n') ) {
|
||||
buffer[length-2] = '\0';
|
||||
length--;
|
||||
length--;
|
||||
} else if((length>=1) && (buffer[length-1]=='\n')) {
|
||||
buffer[length-1] = '\0';
|
||||
length--;
|
||||
}
|
||||
if(strstr(buffer,"SECT")==NULL) continue;
|
||||
if(strstr(buffer,"??_")!=NULL) continue;
|
||||
if(strstr(buffer,"External")==NULL) continue;
|
||||
|
||||
{
|
||||
char** words;
|
||||
int wordn;
|
||||
words = GetWords (buffer," ",&wordn);
|
||||
if(wordn>=8) {
|
||||
int iword = 7;
|
||||
if(strcmp(words[4],"()")==0) {
|
||||
iword = 7;
|
||||
} else if(strcmp(words[4],"External")==0) {
|
||||
iword = 6;
|
||||
}
|
||||
if(words[iword][0]=='_') {
|
||||
if(iword==6) {
|
||||
printf(" %s\tDATA\n",words[iword]+1);
|
||||
} else {
|
||||
printf(" %s\n",words[iword]+1);
|
||||
}
|
||||
} else {
|
||||
if(iword==6) {
|
||||
printf(" %s\tDATA\n",words[iword]);
|
||||
} else {
|
||||
printf(" %s\n",words[iword]);
|
||||
}
|
||||
}
|
||||
}
|
||||
{int count;
|
||||
for(count=0;count<wordn;count++) if(words[count]) free(words[count]);
|
||||
if(words) free(words);}
|
||||
}
|
||||
/*printf("%s\n",buffer);*/
|
||||
}
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
/*****************************************************************************/
|
||||
char** GetWords (
|
||||
char* a_string
|
||||
,char* a_limiter
|
||||
,int* a_number
|
||||
)
|
||||
/***************************************************************************/
|
||||
/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
|
||||
{
|
||||
#define STRDUP(str) ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : (char*)NULL)
|
||||
#define STRDEL(str) {if((str)!=NULL) {free(str);str=NULL;}}
|
||||
int count;
|
||||
char* string;
|
||||
char* token;
|
||||
int iline;
|
||||
char** list = NULL;
|
||||
int nline = 0;
|
||||
/*.........................................................................*/
|
||||
if(a_number!=NULL) *a_number = 0;
|
||||
if( (a_string==NULL) || (*a_string=='\0') ) return NULL;
|
||||
if(a_limiter==NULL) return NULL;
|
||||
|
||||
string = STRDUP(a_string);
|
||||
if(string==NULL) return NULL;
|
||||
|
||||
nline = 16;
|
||||
list = (char**)malloc(nline*sizeof(char*));
|
||||
if(list==NULL) return NULL;
|
||||
iline = 0;
|
||||
|
||||
token = string;
|
||||
while(1) {
|
||||
char* pos;
|
||||
pos = strstr (token,a_limiter);
|
||||
if(pos!=NULL) {
|
||||
*pos = '\0';
|
||||
if(*token!='\0') {
|
||||
if(iline>=nline) {
|
||||
nline +=16;
|
||||
list = (char**)realloc(list,nline*sizeof(char*));
|
||||
if(list==NULL) return NULL;
|
||||
}
|
||||
list[iline] = token;
|
||||
iline++;
|
||||
}
|
||||
token = pos + strlen(a_limiter);
|
||||
} else { /*last word*/
|
||||
if(*token!='\0') {
|
||||
if(iline>=nline) {
|
||||
nline += 16;
|
||||
list = (char**)realloc(list,nline*sizeof(char*));
|
||||
if(list==NULL) return NULL;
|
||||
}
|
||||
list[iline] = token;
|
||||
iline++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for(count=0;count<iline;count++) list[count] = STRDUP(list[count]);
|
||||
STRDEL(string);
|
||||
|
||||
if(iline==0) {
|
||||
if(list) free(list);
|
||||
if(a_number!=NULL) *a_number = 0;
|
||||
return NULL;
|
||||
} else {
|
||||
if(a_number!=NULL) *a_number = iline;
|
||||
return list;
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken from
|
||||
// $Id: MomoEventAction.hh,v 1.1 2003/11/04 09:02:26 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
//
|
||||
|
||||
#ifndef MomoEventAction_h
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken after
|
||||
// $Id: MomoRunAction.hh,v 1.1 2003/11/04 09:02:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
//
|
||||
|
||||
#ifndef MomoRunAction_h
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken from
|
||||
// $Id: MomoEventAction.cc,v 1.1 2003/11/04 09:02:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
//
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
// Taken from
|
||||
// $Id: MomoRunAction.cc,v 1.1 2003/11/04 09:02:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
//
|
||||
|
||||
|
||||
|
||||
+11
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.77 2003/12/08 18:17:04 gcosmo Exp $
|
||||
$Id: History,v 1.80 2004/03/25 18:10:57 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,16 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
25th March 2004 Gabriele Cosmo (examples-V06-00-02)
|
||||
- Updated reference outputs according to reference tag geant4-06-01-ref-00.
|
||||
|
||||
26th February 2004 Gabriele Cosmo (examples-V06-00-01)
|
||||
- Updated reference outputs according to reference tag geant4-06-00-ref-02.
|
||||
- Includes tags: exampleA01-V06-00-00, testem5-V06-00-00, testem7-V06-00-00.
|
||||
|
||||
30th January 2004 Sergei Sadilov (examples-V06-00-00)
|
||||
- Updated reference outputs according to reference tag geant4-06-00-ref-01.
|
||||
|
||||
8th December 2003 Sergei Sadilov (examples-V05-02-08)
|
||||
- Updated reference outputs according to candidate tag geant4-06-00-cand-03.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-------------------------------------------------------------------
|
||||
$Id: History,v 1.1 2003/12/02 12:36:42 gcosmo Exp $
|
||||
$Id: History,v 1.2 2004/03/12 16:17:29 ribon Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -9,6 +9,9 @@ $Id: History,v 1.1 2003/12/02 12:36:42 gcosmo Exp $
|
||||
Category History file
|
||||
---------------------
|
||||
|
||||
12.03.2004 - A.Ribon (Rich-V06-00-00)
|
||||
Fixed compilation errors and warnings for g++ 3.2 .
|
||||
|
||||
02.12.2003 - G.Cosmo (Rich-V05-02-00)
|
||||
Fixed compilation errors and warnings ...
|
||||
|
||||
|
||||
@@ -126,6 +126,7 @@ prepare some environment variables by source-ing one of the following
|
||||
startup scripts:
|
||||
|
||||
(THIS EXAMPLE HAS BEEN DEVELOPED AND TESTED WITH THE gcc-2.95.5 COMPILER)
|
||||
(A.R. 12-Mar-2004 : TESTED ALSO WITH gcc-3.2 or Linux RH 7.3)
|
||||
|
||||
o Setup the environment variable: G4ANALYSIS_USE 1
|
||||
o setenv PATH ${PATH}:/afs/cern.ch/sw/lhcxx/specific/redhat73/gcc-2.95.2/5.0.5/bin
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
virtual ~AerogelRefData();
|
||||
|
||||
void ReadStdAerogelRefIndex();
|
||||
vector<G4double> GetCurAerogelRefIndValueVect(G4int AerogelTypenum );
|
||||
std::vector<G4double> GetCurAerogelRefIndValueVect(G4int AerogelTypenum );
|
||||
G4double GetCurAerogelRefIndValue( G4int rbinw , G4int AerogelTypenum );
|
||||
G4double GetRefnominal(G4int);
|
||||
AerogelType GetAerogelType(G4int);
|
||||
@@ -50,9 +50,9 @@ public:
|
||||
{return StdAerogelRefphotE[BinNumw]; }
|
||||
G4double GetStdAerogelRefIndValue(G4int BinNumv )
|
||||
{return StdAerogelRefIndexValue[BinNumv];}
|
||||
vector<G4double> GetAerogelRefphotEVect()
|
||||
std::vector<G4double> GetAerogelRefphotEVect()
|
||||
{ return StdAerogelRefphotE ; }
|
||||
vector<G4double> GetStdAerogelRefIndValueVect()
|
||||
std::vector<G4double> GetStdAerogelRefIndValueVect()
|
||||
{return StdAerogelRefIndexValue ; }
|
||||
|
||||
G4double GetAerogelRefIndShift(G4int iAgtype)
|
||||
@@ -65,11 +65,11 @@ private:
|
||||
|
||||
G4String AerogelRefIndexFileName;
|
||||
G4int NumberOfRefIndBins;
|
||||
vector<G4double>StdAerogelRefphotE ;
|
||||
vector<G4double>StdAerogelRefIndexValue ;
|
||||
std::vector<G4double>StdAerogelRefphotE ;
|
||||
std::vector<G4double>StdAerogelRefIndexValue ;
|
||||
G4double StdAerogelNominalRefractiveIndex;
|
||||
vector<G4double> AerogelRefIndShift;
|
||||
vector<G4double> AerogelWavelengthRef;
|
||||
std::vector<G4double> AerogelRefIndShift;
|
||||
std::vector<G4double> AerogelWavelengthRef;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -49,9 +49,9 @@ public:
|
||||
G4double GetCurTransTotValue(G4int BinNumv ) {return TransTotValue[BinNumv];}
|
||||
|
||||
G4double GetCurFilterThickness() {return FilterThickness; }
|
||||
vector<G4double> GetTransWL() { return TransWaveL ; }
|
||||
vector<G4double> GetTransValue() {return TransValue ; }
|
||||
vector<G4double> GetTransTotValue() {return TransTotValue ; }
|
||||
std::vector<G4double> GetTransWL() { return TransWaveL ; }
|
||||
std::vector<G4double> GetTransValue() {return TransValue ; }
|
||||
std::vector<G4double> GetTransTotValue() {return TransTotValue ; }
|
||||
FilterType GetFilterTypeIndex() {return FilterTypeIndex ; }
|
||||
|
||||
private:
|
||||
@@ -61,9 +61,9 @@ private:
|
||||
G4int NumberOfTrBins;
|
||||
G4double FilterThickness;
|
||||
G4double FilterRefIndexNominal;
|
||||
vector<G4double>TransWaveL ;
|
||||
vector<G4double>TransValue ;
|
||||
vector<G4double>TransTotValue;
|
||||
std::vector<G4double>TransWaveL ;
|
||||
std::vector<G4double>TransValue ;
|
||||
std::vector<G4double>TransTotValue;
|
||||
G4double CurNeighbourRefIndexNominal;
|
||||
G4String FilterTransDataFileName;
|
||||
|
||||
|
||||
@@ -78,10 +78,10 @@ public:
|
||||
G4double HpdPhElectronKE;
|
||||
G4double PhCathodeToSilDetDist;
|
||||
G4double PSFsigma;
|
||||
vector<G4double>DemagnificationFactor;
|
||||
vector<G4double>DemagnificationQuadFactor;
|
||||
vector<vector<G4double> >HpdQE;
|
||||
vector<vector<G4double> >HpdWabin;
|
||||
std::vector<G4double>DemagnificationFactor;
|
||||
std::vector<G4double>DemagnificationQuadFactor;
|
||||
std::vector<std::vector<G4double> >HpdQE;
|
||||
std::vector<std::vector<G4double> >HpdWabin;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -123,12 +123,12 @@ private:
|
||||
G4LogicalVolume* RichTbRadDnWLVol;
|
||||
G4VPhysicalVolume* RichTbRadDnWPVol;
|
||||
G4int NumAerogelTiles;
|
||||
vector<G4LogicalVolume*> RichTbAgelLVol;
|
||||
vector<G4VPhysicalVolume*> RichTbAgelPVol;
|
||||
vector<G4LogicalVolume*> RichTbAgelWrapTopLVol;
|
||||
vector<G4VPhysicalVolume*> RichTbAgelWrapTopPVol;
|
||||
vector<G4LogicalVolume*> RichTbAgelWrapBotLVol;
|
||||
vector<G4VPhysicalVolume*> RichTbAgelWrapBotPVol;
|
||||
std::vector<G4LogicalVolume*> RichTbAgelLVol;
|
||||
std::vector<G4VPhysicalVolume*> RichTbAgelPVol;
|
||||
std::vector<G4LogicalVolume*> RichTbAgelWrapTopLVol;
|
||||
std::vector<G4VPhysicalVolume*> RichTbAgelWrapTopPVol;
|
||||
std::vector<G4LogicalVolume*> RichTbAgelWrapBotLVol;
|
||||
std::vector<G4VPhysicalVolume*> RichTbAgelWrapBotPVol;
|
||||
G4LogicalVolume* RichTbFilterLVol;
|
||||
G4VPhysicalVolume* RichTbFilterPVol;
|
||||
G4bool ConstructTrackingGeometrySwitch;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#define RichTbIOData_h 1
|
||||
#include "globals.hh"
|
||||
#include <iostream>
|
||||
#include <fstream.h>
|
||||
#include <fstream>
|
||||
#include "RichTbRunConfig.hh"
|
||||
#include "G4Event.hh"
|
||||
class RichTbIOData {
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
void WriteOutHitData(const G4Event* );
|
||||
|
||||
private:
|
||||
ofstream OutputDataFS;
|
||||
std::ofstream OutputDataFS;
|
||||
G4String aOutFileString;
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -103,7 +103,7 @@ private:
|
||||
G4Material* RichTbH2O;
|
||||
G4Material* RichTbMirrorQuartz;
|
||||
G4Material* RichTbQuartzWindowMaterial;
|
||||
vector<G4Material*> RichTbAerogelMaterial;
|
||||
std::vector<G4Material*> RichTbAerogelMaterial;
|
||||
|
||||
G4Material* RichTbAerogelTypeA;
|
||||
G4Material* RichTbAerogelTypeB;
|
||||
@@ -120,7 +120,7 @@ private:
|
||||
G4Material* HpdQuartzWindowMaterial;
|
||||
G4Material* PadHpdQuartzWindowMaterial;
|
||||
|
||||
vector<G4Material*> RichTbFilterMaterial;
|
||||
std::vector<G4Material*> RichTbFilterMaterial;
|
||||
G4Material* GlassD263FilterMaterial;
|
||||
G4Material* PadHpdPhCathodeMaterial;
|
||||
G4Material* RichTbPlasticAg;
|
||||
|
||||
@@ -39,14 +39,14 @@ extern void InitializeRichTbMaterial();
|
||||
extern void HistoRichTbMaterialProperties(RichTbRunConfig* RConfig);
|
||||
|
||||
|
||||
extern vector<G4double> InitializeHpdQE(G4int);
|
||||
extern vector<G4double> InitializeHpdWaveL(G4int);
|
||||
extern vector<G4double> InitN2RefIndex(G4double, G4double);
|
||||
extern vector<G4double> InitN2RefPhotW();
|
||||
extern vector<G4double> InitAgelPhotW();
|
||||
extern vector<G4double> InitializePhotonMomentumVector();
|
||||
extern vector<G4int> getDeadPixelList(G4int ihpdNum , G4int IsectNum);
|
||||
extern vector<G4double>GetAerogelRScatLength(AerogelType);
|
||||
extern std::vector<G4double> InitializeHpdQE(G4int);
|
||||
extern std::vector<G4double> InitializeHpdWaveL(G4int);
|
||||
extern std::vector<G4double> InitN2RefIndex(G4double, G4double);
|
||||
extern std::vector<G4double> InitN2RefPhotW();
|
||||
extern std::vector<G4double> InitAgelPhotW();
|
||||
extern std::vector<G4double> InitializePhotonMomentumVector();
|
||||
extern std::vector<G4int> getDeadPixelList(G4int ihpdNum , G4int IsectNum);
|
||||
extern std::vector<G4double>GetAerogelRScatLength(AerogelType);
|
||||
extern G4double GetCurrentBulkTrans(G4double currentMatRefIndex,
|
||||
G4double currentNeighbourRefIndex,
|
||||
G4double MaxTotMeasuredTransmission);
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "AerogelRefData.hh"
|
||||
#include "FilterTrData.hh"
|
||||
#include <math.h>
|
||||
#include <fstream.h>
|
||||
#include <fstream>
|
||||
class RichTbRunConfig{
|
||||
public:
|
||||
RichTbRunConfig();
|
||||
@@ -143,8 +143,8 @@ private:
|
||||
G4int FilterTNumber;
|
||||
FilterType CurFilterType;
|
||||
G4int NumberOfAerogelTiles;
|
||||
vector<G4int>CurAerogelTNumber;
|
||||
vector<AerogelType>CurAerogelType;
|
||||
std::vector<G4int>CurAerogelTNumber;
|
||||
std::vector<AerogelType>CurAerogelType;
|
||||
G4int WriteOutputFile;
|
||||
G4String OutputFileName;
|
||||
G4String OutputHistoDirName;
|
||||
|
||||
@@ -56,7 +56,7 @@ class RichTbSD : public G4VSensitiveDetector
|
||||
G4int NumberOfSensitiveHpds;
|
||||
G4int NumberOfSensitiveSectorsInHpd;
|
||||
G4int NumberOfSensitivePixelsInSector;
|
||||
vector<G4int> HpdSDID;
|
||||
std::vector<G4int> HpdSDID;
|
||||
|
||||
|
||||
G4int HCID;
|
||||
|
||||
@@ -26,17 +26,17 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include "AerogelRefData.hh"
|
||||
#include "RichTbGeometryParameters.hh"
|
||||
#include "RichTbMaterialParameters.hh"
|
||||
AerogelRefData::AerogelRefData(G4String AgelRefIndFile)
|
||||
:NumberOfRefIndBins(NumAerogelRefIndexPhotonEnergyBins),
|
||||
StdAerogelRefphotE(vector<G4double>(NumAerogelRefIndexPhotonEnergyBins)),
|
||||
StdAerogelRefIndexValue(vector<G4double>(NumAerogelRefIndexPhotonEnergyBins)),
|
||||
AerogelRefIndShift(vector<G4double>( MaxNumberOfAerogelTypes)),
|
||||
AerogelWavelengthRef(vector<G4double>( MaxNumberOfAerogelTypes)) {
|
||||
StdAerogelRefphotE(std::vector<G4double>(NumAerogelRefIndexPhotonEnergyBins)),
|
||||
StdAerogelRefIndexValue(std::vector<G4double>(NumAerogelRefIndexPhotonEnergyBins)),
|
||||
AerogelRefIndShift(std::vector<G4double>( MaxNumberOfAerogelTypes)),
|
||||
AerogelWavelengthRef(std::vector<G4double>( MaxNumberOfAerogelTypes)) {
|
||||
|
||||
AerogelRefIndexFileName=AgelRefIndFile;
|
||||
|
||||
@@ -101,7 +101,7 @@ void AerogelRefData::ReadStdAerogelRefIndex() {
|
||||
|
||||
G4cout<<"Now reading Std Aerogel Ref Index from "
|
||||
<<StdAerogelRefIndFile<<G4endl;
|
||||
ifstream finpga(StdAerogelRefIndFile);
|
||||
std::ifstream finpga(StdAerogelRefIndFile);
|
||||
G4double ephot,rind;
|
||||
for (G4int fbin=0; fbin< NumberOfRefIndBins ; fbin++){
|
||||
finpga>>ephot;
|
||||
@@ -116,9 +116,9 @@ void AerogelRefData::ReadStdAerogelRefIndex() {
|
||||
}
|
||||
}
|
||||
|
||||
vector<G4double> AerogelRefData::GetCurAerogelRefIndValueVect (G4int AerogelTnum ) {
|
||||
std::vector<G4double> AerogelRefData::GetCurAerogelRefIndValueVect (G4int AerogelTnum ) {
|
||||
// no test for tdr rich. now put back to TB conditions.
|
||||
vector<G4double>CAgel(NumberOfRefIndBins);
|
||||
std::vector<G4double>CAgel(NumberOfRefIndBins);
|
||||
// AerogelType Ctype;
|
||||
G4double CRn = GetRefnominal( AerogelTnum );
|
||||
for (G4int ib=0; ib < NumberOfRefIndBins; ib++ ){
|
||||
|
||||
@@ -26,17 +26,17 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include "FilterTrData.hh"
|
||||
#include "RichTbGeometryParameters.hh"
|
||||
#include "RichTbMaterialParameters.hh"
|
||||
|
||||
FilterTrData::FilterTrData(G4int FilterTypeNum, G4String FilterDataFileName )
|
||||
:NumberOfTrBins(NumFilterTransBins),
|
||||
TransWaveL(vector<G4double>(NumFilterTransBins)),
|
||||
TransValue(vector<G4double>(NumFilterTransBins)),
|
||||
TransTotValue(vector<G4double>(NumFilterTransBins))
|
||||
TransWaveL(std::vector<G4double>(NumFilterTransBins)),
|
||||
TransValue(std::vector<G4double>(NumFilterTransBins)),
|
||||
TransTotValue(std::vector<G4double>(NumFilterTransBins))
|
||||
{
|
||||
// In the G4example the same type of filter is used
|
||||
// for all types of filters.
|
||||
@@ -72,7 +72,7 @@ void FilterTrData::ReadFilterTrans() {
|
||||
TransValue.resize(NumberOfTrBins);
|
||||
TransTotValue.resize(NumberOfTrBins);
|
||||
}
|
||||
ifstream finpga(D263FilterTransFile);
|
||||
std::ifstream finpga(D263FilterTransFile);
|
||||
G4double wa,trn;
|
||||
//set the order to have increasing in wavelength after reading in.
|
||||
//the data file is with decreasing order of wavelength.
|
||||
|
||||
@@ -44,10 +44,10 @@
|
||||
PadHpdPhotoElectricEffect::PadHpdPhotoElectricEffect(const G4String& processName ,
|
||||
RichTbRunConfig* RConfig)
|
||||
:G4VDiscreteProcess(processName),
|
||||
DemagnificationFactor(vector<G4double>(NumHpdTot)),
|
||||
DemagnificationQuadFactor(vector<G4double>(NumHpdTot)),
|
||||
HpdQE(NumHpdTot, vector<G4double>( NumQEbins)),
|
||||
HpdWabin(NumHpdTot, vector<G4double>( NumQEbins))
|
||||
DemagnificationFactor(std::vector<G4double>(NumHpdTot)),
|
||||
DemagnificationQuadFactor(std::vector<G4double>(NumHpdTot)),
|
||||
HpdQE(NumHpdTot, std::vector<G4double>( NumQEbins)),
|
||||
HpdWabin(NumHpdTot, std::vector<G4double>( NumQEbins))
|
||||
{
|
||||
rConfig=RConfig;
|
||||
PrePhotoElectricVolName="PadHpdWindowQuartz";
|
||||
@@ -78,8 +78,8 @@ PadHpdPhotoElectricEffect::PadHpdPhotoElectricEffect(const G4String& processName
|
||||
DemagnificationFactor[ihpdq] = DemagnificationFactor[ihpdq]*(1.0+DemagError);
|
||||
|
||||
|
||||
vector<G4double>qeCurHpd = InitializeHpdQE(ihpdq);
|
||||
vector<G4double>waCurHpd = InitializeHpdWaveL(ihpdq);
|
||||
std::vector<G4double>qeCurHpd = InitializeHpdQE(ihpdq);
|
||||
std::vector<G4double>waCurHpd = InitializeHpdWaveL(ihpdq);
|
||||
if(qeCurHpd.size() != waCurHpd.size() ) {
|
||||
G4cout<<"Wrong size for Hpd QE "<<ihpdq<<" "<<qeCurHpd.size()
|
||||
<<" "<< waCurHpd.size()<<G4endl;
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "globals.hh"
|
||||
#include "RichTbDetectorConstruction.hh"
|
||||
#include "RichTbGeometryParameters.hh"
|
||||
@@ -50,12 +50,12 @@ RichTbComponent::RichTbComponent(){ ; }
|
||||
RichTbComponent::RichTbComponent(RichTbMaterial* RMaterial,
|
||||
RichTbHall* RTbHall , RichTbRunConfig* RConfig,
|
||||
G4bool ConstructTrackingSwitch):
|
||||
RichTbAgelLVol(vector<G4LogicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelPVol(vector<G4VPhysicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapTopLVol(vector<G4LogicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapTopPVol(vector<G4VPhysicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapBotLVol(vector<G4LogicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapBotPVol(vector<G4VPhysicalVolume*>(MaxNumberOfAerogelTiles))
|
||||
RichTbAgelLVol(std::vector<G4LogicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelPVol(std::vector<G4VPhysicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapTopLVol(std::vector<G4LogicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapTopPVol(std::vector<G4VPhysicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapBotLVol(std::vector<G4LogicalVolume*>(MaxNumberOfAerogelTiles)),
|
||||
RichTbAgelWrapBotPVol(std::vector<G4VPhysicalVolume*>(MaxNumberOfAerogelTiles))
|
||||
{
|
||||
|
||||
ConstructTrackingGeometrySwitch=ConstructTrackingSwitch;
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "RichTbMaterialParameters.hh"
|
||||
#include "RichTbGeometryParameters.hh"
|
||||
#include "RichTbDetectorConstruction.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "RichTbDetectorConstruction.hh"
|
||||
#include "RichTbHall.hh"
|
||||
#include "RichTbComponent.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "RichTbDetectorConstruction.hh"
|
||||
#include "RichTbHall.hh"
|
||||
#include "RichTbMaterial.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "globals.hh"
|
||||
#include "G4Box.hh"
|
||||
#include "G4Trd.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include <math.h>
|
||||
#include "globals.hh"
|
||||
#include "RichTbMaterial.hh"
|
||||
@@ -47,8 +47,8 @@
|
||||
|
||||
|
||||
RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
RichTbAerogelMaterial(vector<G4Material*> (MaxNumberOfAerogelTypes)),
|
||||
RichTbFilterMaterial(vector<G4Material*>(MaxNumberOfFilterTypes)){
|
||||
RichTbAerogelMaterial(std::vector<G4Material*> (MaxNumberOfAerogelTypes)),
|
||||
RichTbFilterMaterial(std::vector<G4Material*>(MaxNumberOfFilterTypes)){
|
||||
|
||||
rConfig=RConfig;
|
||||
|
||||
@@ -212,8 +212,8 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
G4double* NitrogenGasPhotW=new G4double[NumPhotWaveLengthBins];
|
||||
|
||||
|
||||
vector<G4double>N2RefInd= InitN2RefIndex(pressure,temperature);
|
||||
vector<G4double>N2RefPhotW=InitN2RefPhotW();
|
||||
std::vector<G4double>N2RefInd= InitN2RefIndex(pressure,temperature);
|
||||
std::vector<G4double>N2RefPhotW=InitN2RefPhotW();
|
||||
|
||||
for (ibin=0; ibin<NumPhotWaveLengthBins; ibin++){
|
||||
NitrogenGasAbsorpLength[ibin]=1.E32*mm;
|
||||
@@ -394,8 +394,8 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
G4double* GlassD263MomValue = new G4double[NumPhotBinGlassD263Trans+2];
|
||||
G4double* currBulkTransFilter = new G4double[NumPhotBinGlassD263Trans+2];
|
||||
FilterTrData* CurFil = RConfig->GetFilterTrData();
|
||||
vector<G4double>GlassD263TransWL = CurFil-> GetTransWL();
|
||||
vector<G4double>GlassD263Transmis = CurFil->GetTransTotValue();
|
||||
std::vector<G4double>GlassD263TransWL = CurFil-> GetTransWL();
|
||||
std::vector<G4double>GlassD263Transmis = CurFil->GetTransTotValue();
|
||||
G4double FilterHalfZ= CurFil->GetCurFilterThickness();
|
||||
|
||||
for (ibin=0; ibin<NumPhotBinGlassD263Trans+2; ibin++){
|
||||
@@ -493,7 +493,7 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
G4double* AerogTypeARScatLength = new G4double[NumPhotWaveLengthBins];
|
||||
G4double* currentAgelTrans = new G4double[NumPhotWaveLengthBins];
|
||||
|
||||
vector<G4double>AerogelTypeASLength = GetAerogelRScatLength(AerogelTypeA);
|
||||
std::vector<G4double>AerogelTypeASLength = GetAerogelRScatLength(AerogelTypeA);
|
||||
G4int AerogNumber=0;
|
||||
G4double AerogelLength=GetCurAerogelLength(AerogNumber);
|
||||
G4double MaxTotTransmission=AerogelTypeATotTrans;
|
||||
@@ -875,11 +875,11 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
OpRichTbEnclosureSurfaceMPT->AddProperty("REFLECTIVITY",
|
||||
RichEnclosureSurfacePhotMom,
|
||||
RichTbEnclosureSurfaceReflectivity,
|
||||
NumPhotonRichEnclosureSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonRichEnclosureSurfaceWaveLengthBins));
|
||||
OpRichTbEnclosureSurfaceMPT->AddProperty("EFFICIENCY",
|
||||
RichEnclosureSurfacePhotMom,
|
||||
RichTbEnclosureSurfaceEfficiency,
|
||||
NumPhotonRichEnclosureSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonRichEnclosureSurfaceWaveLengthBins));
|
||||
|
||||
OpRichTbEnclosureSurface->
|
||||
SetMaterialPropertiesTable(OpRichTbEnclosureSurfaceMPT);
|
||||
@@ -913,11 +913,11 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
OpHpdQuartzWTSurfaceMPT->AddProperty("REFLECTIVITY",
|
||||
HpdQuartzWTSurfacePhotMom,
|
||||
HpdQuartzWTSurfaceReflectivity,
|
||||
NumPhotonHpdQuartzWTSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdQuartzWTSurfaceWaveLengthBins));
|
||||
OpHpdQuartzWTSurfaceMPT->AddProperty("EFFICIENCY",
|
||||
HpdQuartzWTSurfacePhotMom,
|
||||
HpdQuartzWTSurfaceEfficiency,
|
||||
NumPhotonHpdQuartzWTSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdQuartzWTSurfaceWaveLengthBins));
|
||||
|
||||
OpHpdQuartzWTSurface->
|
||||
SetMaterialPropertiesTable(OpHpdQuartzWTSurfaceMPT);
|
||||
@@ -953,11 +953,11 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
OpHpdQuartzWPSurfaceMPT->AddProperty("REFLECTIVITY",
|
||||
HpdQuartzWPSurfacePhotMom,
|
||||
HpdQuartzWPSurfaceReflectivity,
|
||||
NumPhotonHpdQuartzWPSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdQuartzWPSurfaceWaveLengthBins));
|
||||
OpHpdQuartzWPSurfaceMPT->AddProperty("EFFICIENCY",
|
||||
HpdQuartzWPSurfacePhotMom,
|
||||
HpdQuartzWPSurfaceEfficiency,
|
||||
NumPhotonHpdQuartzWPSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdQuartzWPSurfaceWaveLengthBins));
|
||||
|
||||
OpHpdQuartzWPSurface->
|
||||
SetMaterialPropertiesTable(OpHpdQuartzWPSurfaceMPT);
|
||||
@@ -998,11 +998,11 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
OpPhCathodeSurfaceMPT->AddProperty("REFLECTIVITY",
|
||||
PhCathodeSurfacePhotMom,
|
||||
PhCathodeSurfaceReflectivity,
|
||||
NumPhotonPhCathodeSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonPhCathodeSurfaceWaveLengthBins));
|
||||
OpPhCathodeSurfaceMPT->AddProperty("EFFICIENCY",
|
||||
PhCathodeSurfacePhotMom,
|
||||
PhCathodeSurfaceEfficiency,
|
||||
NumPhotonPhCathodeSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonPhCathodeSurfaceWaveLengthBins));
|
||||
|
||||
OpPhCathodeSurface->
|
||||
SetMaterialPropertiesTable(OpPhCathodeSurfaceMPT);
|
||||
@@ -1044,15 +1044,15 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
OpHpdSiCoatSurfaceMPT->AddProperty("REFLECTIVITY",
|
||||
HpdSiCoatSurfacePhotMom,
|
||||
HpdSiCoatSurfaceReflectivity,
|
||||
NumPhotonHpdSiCoatSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdSiCoatSurfaceWaveLengthBins));
|
||||
OpHpdSiCoatSurfaceMPT->AddProperty("EFFICIENCY",
|
||||
HpdSiCoatSurfacePhotMom,
|
||||
HpdSiCoatSurfaceEfficiency,
|
||||
NumPhotonHpdSiCoatSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdSiCoatSurfaceWaveLengthBins));
|
||||
OpHpdSiCoatSurfaceMPT->AddProperty("RINDEX",
|
||||
HpdSiCoatSurfacePhotMom,
|
||||
HpdSiCoatSurfaceRefInd,
|
||||
NumPhotonHpdSiCoatSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdSiCoatSurfaceWaveLengthBins));
|
||||
|
||||
OpHpdSiCoatSurface->
|
||||
SetMaterialPropertiesTable(OpHpdSiCoatSurfaceMPT);
|
||||
@@ -1086,11 +1086,11 @@ RichTbMaterial::RichTbMaterial(RichTbRunConfig* RConfig):
|
||||
OpRichTbHpdMetalSurfaceMPT->AddProperty("REFLECTIVITY",
|
||||
RichHpdMetalSurfacePhotMom,
|
||||
RichHpdMetalSurfaceReflectivity,
|
||||
NumPhotonHpdMetalSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdMetalSurfaceWaveLengthBins));
|
||||
OpRichTbHpdMetalSurfaceMPT->AddProperty("EFFICIENCY",
|
||||
RichHpdMetalSurfacePhotMom,
|
||||
RichHpdMetalSurfaceEfficiency,
|
||||
NumPhotonHpdMetalSurfaceWaveLengthBins);
|
||||
static_cast<int>(NumPhotonHpdMetalSurfaceWaveLengthBins));
|
||||
|
||||
OpRichTbHpdMetalSurface->
|
||||
SetMaterialPropertiesTable(OpRichTbHpdMetalSurfaceMPT);
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include "globals.hh"
|
||||
#include "RichTbGeometryParameters.hh"
|
||||
#include "RichTbMaterialParameters.hh"
|
||||
@@ -41,20 +41,20 @@ void InitializeRichTbMaterial(){
|
||||
|
||||
}
|
||||
|
||||
vector<G4double> InitializePhotonMomentumVector() {
|
||||
std::vector<G4double> InitializePhotonMomentumVector() {
|
||||
|
||||
G4double PhotonEnergyStep=(PhotonMaxEnergy-PhotonMinEnergy)/
|
||||
NumPhotWaveLengthBins;
|
||||
vector<G4double>PhotMomVect(NumPhotWaveLengthBins);
|
||||
std::vector<G4double>PhotMomVect(NumPhotWaveLengthBins);
|
||||
for (G4int ibin=0; ibin<NumPhotWaveLengthBins; ibin++){
|
||||
PhotMomVect[ibin]=PhotonMinEnergy+PhotonEnergyStep*ibin;
|
||||
}
|
||||
return PhotMomVect;
|
||||
}
|
||||
vector<G4double> InitN2RefIndex(G4double pressure, G4double temperature){
|
||||
std::vector<G4double> InitN2RefIndex(G4double pressure, G4double temperature){
|
||||
|
||||
vector<G4double> PmV=InitN2RefPhotW();
|
||||
vector<G4double> RefN2(NumPhotWaveLengthBins);
|
||||
std::vector<G4double> PmV=InitN2RefPhotW();
|
||||
std::vector<G4double> RefN2(NumPhotWaveLengthBins);
|
||||
G4double GasRhoN2Cur=GasRhoN2atSTP*(GasTemperature_STP/temperature)*
|
||||
(pressure/ GasPressure_STP);
|
||||
G4double epho,pfe,cpfe;
|
||||
@@ -68,20 +68,20 @@ vector<G4double> InitN2RefIndex(G4double pressure, G4double temperature){
|
||||
}
|
||||
return RefN2;
|
||||
}
|
||||
vector<G4double> InitN2RefPhotW() {
|
||||
std::vector<G4double> InitN2RefPhotW() {
|
||||
return InitializePhotonMomentumVector() ;
|
||||
}
|
||||
vector<G4double> InitAgelPhotW() {
|
||||
std::vector<G4double> InitAgelPhotW() {
|
||||
return InitializePhotonMomentumVector() ;
|
||||
}
|
||||
vector<G4double> InitializeHpdQE(G4int ihpdqe) {
|
||||
std::vector<G4double> InitializeHpdQE(G4int ihpdqe) {
|
||||
// Initialize the HPD QE
|
||||
G4int iqb;
|
||||
if(ihpdqe >= NumHpdTot ) {
|
||||
G4cout<<"Wrong HPD Number for QE " <<ihpdqe<<" vs "
|
||||
<<NumHpdTot <<G4endl;
|
||||
}
|
||||
vector<G4double>qeCurPerCent(NumQEbins);
|
||||
std::vector<G4double>qeCurPerCent(NumQEbins);
|
||||
if(ihpdqe == 0 ){
|
||||
for(iqb=0; iqb<NumQEbins; iqb++){
|
||||
qeCurPerCent[iqb] = Hpd0QEPerCent[iqb]* HpdQEReductionFactor;
|
||||
@@ -105,14 +105,14 @@ vector<G4double> InitializeHpdQE(G4int ihpdqe) {
|
||||
|
||||
return qeCurPerCent;
|
||||
}
|
||||
vector<G4double> InitializeHpdWaveL(G4int ihpdqe) {
|
||||
std::vector<G4double> InitializeHpdWaveL(G4int ihpdqe) {
|
||||
G4int iqb;
|
||||
if(ihpdqe >= NumHpdTot ) {
|
||||
G4cout<<"Wrong HPD Number for QE wavelength " <<ihpdqe<<" vs "
|
||||
<<NumHpdTot <<G4endl;
|
||||
}
|
||||
// for now all HPDs have the same wavelength bins.
|
||||
vector<G4double>HpdQEW(NumQEbins);
|
||||
std::vector<G4double>HpdQEW(NumQEbins);
|
||||
for (iqb=0; iqb<NumQEbins; iqb++){
|
||||
HpdQEW[iqb]= HpdQEWaveL[iqb];
|
||||
}
|
||||
@@ -156,16 +156,16 @@ void HistoRichTbMaterialProperties(RichTbRunConfig* RConfig) {
|
||||
|
||||
G4int ihpdqa;
|
||||
ihpdqa=0;
|
||||
vector<G4double>WaveL1 = InitializeHpdWaveL(ihpdqa);
|
||||
vector<G4double>QEff1 = InitializeHpdQE(ihpdqa);
|
||||
std::vector<G4double>WaveL1 = InitializeHpdWaveL(ihpdqa);
|
||||
std::vector<G4double>QEff1 = InitializeHpdQE(ihpdqa);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
vector<G4int> getDeadPixelList(G4int ihpdNum, G4int){
|
||||
vector<G4int>DeadPixelList;
|
||||
std::vector<G4int> getDeadPixelList(G4int ihpdNum, G4int){
|
||||
std::vector<G4int>DeadPixelList;
|
||||
// G4int isc,ipsc;
|
||||
|
||||
|
||||
@@ -176,10 +176,10 @@ vector<G4int> getDeadPixelList(G4int ihpdNum, G4int){
|
||||
|
||||
return DeadPixelList;
|
||||
}
|
||||
vector<G4double>GetAerogelRScatLength(AerogelType CurrentAerogelType) {
|
||||
std::vector<G4double>GetAerogelRScatLength(AerogelType CurrentAerogelType) {
|
||||
|
||||
vector<G4double>AgelRayleighScatLength(NumPhotWaveLengthBins);
|
||||
vector<G4double>AgelPhotW = InitAgelPhotW();
|
||||
std::vector<G4double>AgelRayleighScatLength(NumPhotWaveLengthBins);
|
||||
std::vector<G4double>AgelPhotW = InitAgelPhotW();
|
||||
G4double aClarity=0.;
|
||||
if(CurrentAerogelType == AerogelTypeA ) {
|
||||
aClarity=AerogelTypeAClarity/(micrometer*micrometer*micrometer*micrometer);
|
||||
@@ -196,7 +196,7 @@ vector<G4double>GetAerogelRScatLength(AerogelType CurrentAerogelType) {
|
||||
}else if (CurrentAerogelType == AerogelTypeE ) {
|
||||
aClarity=AerogelTypeEClarity/(micrometer*micrometer*micrometer*micrometer);
|
||||
|
||||
}else {G4cout<<"Unknown Aerogel Type for Rayleigh Scat Length "<<endl; }
|
||||
}else {G4cout<<"Unknown Aerogel Type for Rayleigh Scat Length "<<G4endl; }
|
||||
|
||||
if(aClarity != 0.0 ) {
|
||||
for(G4int ibinw=0; ibinw<NumPhotWaveLengthBins; ibinw++ ){
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include "globals.hh"
|
||||
#include "RichTbPhotoDetector.hh"
|
||||
#include "G4VPhysicalVolume.hh"
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream>
|
||||
#include <fstream.h>
|
||||
#include <fstream>
|
||||
#include "RichTbRunConfig.hh"
|
||||
#include "RichTbMaterialParameters.hh"
|
||||
#include "globals.hh"
|
||||
RichTbRunConfig::RichTbRunConfig()
|
||||
:CurAerogelTNumber(vector<G4int>(MaxNumberOfAerogelTiles)),
|
||||
CurAerogelType(vector<AerogelType>(MaxNumberOfAerogelTiles)){
|
||||
:CurAerogelTNumber(std::vector<G4int>(MaxNumberOfAerogelTiles)),
|
||||
CurAerogelType(std::vector<AerogelType>(MaxNumberOfAerogelTiles)){
|
||||
|
||||
const char* RunConfigFile = "RunConfig.dat" ;
|
||||
G4cout<<" Run Configuration Input is from "<< RunConfigFile<<G4endl;
|
||||
@@ -104,7 +104,7 @@ RichTbRunConfig::RichTbRunConfig()
|
||||
G4cout<<"Now getting the run configuration file. "
|
||||
<< "the Runconfig file name is "<< RunConfigFile <<G4endl;
|
||||
|
||||
ifstream finp(RunConfigFile);
|
||||
std::ifstream finp(RunConfigFile);
|
||||
|
||||
finp>>RichTbHall_visib;
|
||||
finp>>RichTbEnclosure_visib;
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "globals.hh"
|
||||
#include "G4Box.hh"
|
||||
#include "G4Trd.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// Created: Sajan Easo (Sajan.Easo@cern.ch)
|
||||
// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include "globals.hh"
|
||||
#include "G4Box.hh"
|
||||
#include "G4Trd.hh"
|
||||
@@ -122,7 +122,7 @@ RichTbSiPixel::RichTbSiPixel(RichTbMaterial* RMaterial,
|
||||
// This just flags the pixel as active.
|
||||
//First Get the deadPixel List
|
||||
G4bool thisPixelisAlive=true;
|
||||
vector<G4int>DeadPxL = getDeadPixelList(IHpdNum,Isector);
|
||||
std::vector<G4int>DeadPxL = getDeadPixelList(IHpdNum,Isector);
|
||||
for(size_t ideadP=0; ideadP<DeadPxL.size(); ideadP++){
|
||||
if(ipixel == DeadPxL[ideadP] )thisPixelisAlive=false;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: GNUmakefile,v 1.5 2003/12/08 17:53:25 gcosmo Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# --------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: History,v 1.18 2003/12/09 08:48:33 daquinog Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: README,v 1.15 2003/12/08 17:53:25 gcosmo Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
Simulation of the TIARA experiment using importance sampling
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: envCommon.csh,v 1.8 2003/12/08 17:53:26 gcosmo Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
# 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.7 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# importing python libraries
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# $Id: runSimNoAnalysis.py,v 1.3 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# $Id: runVisMode.py,v 1.3 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: vis.mac,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: CLHEP.i,v 1.3 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: G4String.i,v 1.1 2003/06/17 15:25:01 mdressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
// coppied from std_string.i
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: G4Kernel.i,v 1.5 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
%module G4Kernel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: Tiara.i,v 1.7 2003/12/08 17:53:26 gcosmo Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
%module Tiara
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: dataAcess.py,v 1.3 2003/06/26 11:54:13 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import os
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: detector.py,v 1.3 2003/06/26 11:54:13 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: dpsManip.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import math
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: extractShelve.py,v 1.3 2003/07/04 13:26:31 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import string
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: liz.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: myLiz.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import sys
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: myUtils.py,v 1.4 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import CLHEP
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: parallelHall.py,v 1.4 2003/06/20 12:41:06 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import G4Kernel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: posLog.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: runSequence.py,v 1.3 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import Tiara
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: slabGeometry.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import math
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tallyData.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraApplication.py,v 1.3 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import string
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraDetectors.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import CLHEP
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraGenerators.py,v 1.2 2003/06/16 17:06:44 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import string
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: tiaraSpecifications.py,v 1.3 2003/06/20 12:41:07 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import CLHEP
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: variableGeometry.py,v 1.2 2003/06/16 17:06:45 dressel Exp $
|
||||
# -------------------------------------------------------------------
|
||||
# GEANT4 tag $Name: geant4-06-00 $
|
||||
# GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
# -------------------------------------------------------------------
|
||||
#
|
||||
import G4Kernel
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorer.hh,v 1.3 2003/06/18 16:40:23 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraCellScorer
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorerStore.hh,v 1.2 2003/06/18 16:40:23 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraCellScorerStore
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraConcreteShieldA.hh,v 1.3 2003/06/25 09:12:35 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraConcreteShieldB.hh,v 1.3 2003/06/25 09:12:36 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDPSSampledEnergy.hh,v 1.5 2003/06/25 09:12:37 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDimensions.hh,v 1.3 2003/06/25 09:12:38 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraEnergyCutProcess.hh,v 1.3 2003/06/25 09:12:39 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraFileAcess.hh,v 1.3 2003/06/25 09:12:40 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraFixedEnergyGenerator.hh,v 1.3 2003/06/25 09:12:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraGeometry.hh,v 1.4 2003/06/25 09:12:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIronShieldA.hh,v 1.3 2003/06/25 09:12:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIronShieldB.hh,v 1.3 2003/06/25 09:12:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraIsotropicDirections.hh,v 1.3 2003/06/25 09:12:45 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraMaterials.hh,v 1.4 2003/06/25 09:12:46 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraMeasure.hh,v 1.3 2003/06/25 09:12:47 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraPart.hh,v 1.3 2003/06/25 09:12:48 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraPhysicsList.hh,v 1.1.1.1 2003/06/12 13:08:24 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraPhysicsList
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraPrimaryGeneratorAction.hh,v 1.1.1.1 2003/06/12 13:08:24 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
|
||||
#ifndef TiaraPrimaryGeneratorAction_hh
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraRandom.hh,v 1.3 2003/06/25 09:12:49 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraSampledEnergy.hh,v 1.4 2003/06/25 09:12:50 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraSim.hh,v 1.4 2003/06/25 09:12:51 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraTally.hh,v 1.4 2003/06/25 09:12:52 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraTimedEventAction.hh,v 1.1.1.1 2003/06/12 13:08:24 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraTimedEventAction
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraVComponent.hh,v 1.4 2003/06/25 09:12:53 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraVDirectionGenerator.hh,v 1.3 2003/06/25 09:12:54 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraVSourceEnergyGenerator.hh,v 1.3 2003/06/25 09:12:55 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraVisEventAction.hh,v 1.1.1.1 2003/06/12 13:08:25 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraVisEventAction
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraVisManager.hh,v 1.1.1.1 2003/06/12 13:08:25 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraVisRunAction.hh,v 1.1.1.1 2003/06/12 13:08:25 dressel Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class TiaraVisRunAction
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4LElastic.cc-alt,v 1.2 2003/06/18 16:40:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// Physics model class G4LElastic
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorer.cc,v 1.3 2003/06/18 16:40:28 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user