lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:49:49 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/persistency/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.30 2008-10-23 14:47:26 gcosmo Exp $
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# -----------------------------------------------------------------------
# GNUmakefile for persistency library. Gabriele Cosmo, 16/11/96.
# -----------------------------------------------------------------------
source/persistency/ascii/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:49:57 bmorgan Exp $
# $Id: CMakeLists.txt 66363 2012-12-18 09:12:54Z gcosmo $
#
#------------------------------------------------------------------------------
source/persistency/ascii/GNUmakefile
+1 -2
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
# $Id: GNUmakefile 66363 2012-12-18 09:12:54Z gcosmo $
# -----------------------------------------------------------------------
# GNUmakefile for persistency library. Gabriele Cosmo, 16/11/96.
# -----------------------------------------------------------------------
@@ -21,7 +21,6 @@ CPPFLAGS += \
-I$(G4BASE)/particles/management/include \
-I$(G4BASE)/materials/include \
-I$(G4BASE)/geometry/solids/CSG/include \
-I$(G4BASE)/geometry/solids/BREPS/include \
-I$(G4BASE)/geometry/solids/specific/include \
-I$(G4BASE)/geometry/solids/Boolean/include \
-I$(G4BASE)/geometry/divisions/include \
source/persistency/ascii/History
+31 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.19 2010-12-15 11:32:48 arce Exp $
$Id: History 77356 2013-11-22 17:10:29Z gcosmo $
-------------------------------------------------------------------
=========================================================
Geant4 - an Object-Oriented Toolkit for Simulation in HEP
@@ -16,6 +16,36 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
22 November 2013 - G.Cosmo (ascii-V09-06-09, ascii-V09-06-08)
- Corrected compilation warning on previous tag...
22 November 2013 - G.Cosmo (ascii-V09-06-07)
- Added support for G4GenericPolycone.
14 November 2013 - G.Cosmo (ascii-V09-06-06)
- Corrected typo in G4tgrUtils::WordIsUnit().
7 November 2013 - G.Cosmo (ascii-V09-06-05)
- Replaced deprecated calls to solids accessor methods.
27 July 2013 - P.Arce (ascii-V09-06-04)
- Corrected typo in G4tgrPlaceParameterisation::operator<<().
Addressing problem report #1504.
23 April 2013 - G.Cosmo (ascii-V09-06-03)
- Corrected History file, for loss of description of tags 06-00 and 06-01...
19 March 2013 - P.Arce (ascii-V09-06-02)
- Bug correction in assembly placement
26 February 2013 - G.Cosmo (ascii-V09-06-01)
- Removed unused data member in G4tgbRotationMatrix.
- Corrected composed text in expection in G4tgrSolidBoolean.
- Cleanup of MT changes in several classes.
15 December 2012 - G.Cosmo (ascii-V09-06-00)
- Removed BREPS solids.
6 November 2012 - G.Cosmo (ascii-V09-05-04)
- Minor fix for porting on AIX to G4tgrVolumeMgr.
source/persistency/ascii/include/G4tgbDetectorBuilder.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbDetectorBuilder.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbDetectorBuilder
source/persistency/ascii/include/G4tgbDetectorConstruction.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbDetectorConstruction.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbDetectorConstruction
source/persistency/ascii/include/G4tgbElement.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbElement.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbElement
source/persistency/ascii/include/G4tgbGeometryDumper.hh
+1 -1
View File
@@ -106,7 +106,7 @@ class G4tgbGeometryDumper
private:
static G4tgbGeometryDumper* theInstance;
static G4ThreadLocal G4tgbGeometryDumper* theInstance;
std::ofstream* theFile;
source/persistency/ascii/include/G4tgbIsotope.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbIsotope.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbIsotope
source/persistency/ascii/include/G4tgbMaterial.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterial.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterial
source/persistency/ascii/include/G4tgbMaterialMgr.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMgr.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgbMaterialMgr
@@ -119,7 +119,7 @@ class G4tgbMaterialMgr
private:
static G4tgbMaterialMgr* theInstance;
static G4ThreadLocal G4tgbMaterialMgr* theInstance;
G4mstgbisot theG4tgbIsotopes;
// List of all tgbIsotopes created
source/persistency/ascii/include/G4tgbMaterialMixture.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixture.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixture
source/persistency/ascii/include/G4tgbMaterialMixtureByNoAtoms.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixtureByNoAtoms.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixtureByNoAtoms
source/persistency/ascii/include/G4tgbMaterialMixtureByVolume.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixtureByVolume.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixtureByVolume
source/persistency/ascii/include/G4tgbMaterialMixtureByWeight.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixtureByWeight.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixtureByWeight
source/persistency/ascii/include/G4tgbMaterialSimple.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialSimple.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialSimple
source/persistency/ascii/include/G4tgbPlaceParamCircle.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParamCircle.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamCircle
source/persistency/ascii/include/G4tgbPlaceParamLinear.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParamLinear.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamLinear
source/persistency/ascii/include/G4tgbPlaceParamSquare.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParamSquare.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamSquare
source/persistency/ascii/include/G4tgbPlaceParameterisation.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParameterisation.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamSquare
source/persistency/ascii/include/G4tgbRotationMatrix.hh
+1 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbRotationMatrix.hh 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgbRotationMatrix
@@ -71,7 +71,6 @@ class G4tgbRotationMatrix
private:
G4tgrRotationMatrix* theTgrRM;
G4RotationMatrix* theG4RM;
};
#endif
source/persistency/ascii/include/G4tgbRotationMatrixMgr.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbRotationMatrixMgr.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgbRotationMatrixMgr
@@ -83,7 +83,7 @@ class G4tgbRotationMatrixMgr
G4tgbRotationMatrixMgr();
void CopyRotMats();
static G4tgbRotationMatrixMgr* theInstance;
static G4ThreadLocal G4tgbRotationMatrixMgr* theInstance;
private:
source/persistency/ascii/include/G4tgbVolume.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbVolume.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbVolume
source/persistency/ascii/include/G4tgbVolumeMgr.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbVolumeMgr.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgbVolume
@@ -137,7 +137,7 @@ class G4tgbVolumeMgr
private:
static G4tgbVolumeMgr* theInstance;
static G4ThreadLocal G4tgbVolumeMgr* theInstance;
G4mssvol theVolumeList;
// Map of G4tgbVolume's: G4String is the G4tgbVolume name,
source/persistency/ascii/include/G4tgrElement.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrElement.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrElement
source/persistency/ascii/include/G4tgrElementFromIsotopes.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrElementFromIsotopes.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrElementFromIsotopes
source/persistency/ascii/include/G4tgrElementSimple.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrElementSimple.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrElementSimple
source/persistency/ascii/include/G4tgrEvaluator.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrEvaluator.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrEvaluator
source/persistency/ascii/include/G4tgrFileIn.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrFileIn.hh 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgrFileIn
@@ -89,7 +89,7 @@ class G4tgrFileIn
G4int theCurrentFile;
// Index of file being read in theFiles
static std::vector<G4tgrFileIn*> theInstances;
static G4ThreadLocal std::vector<G4tgrFileIn*> *theInstances;
// Vector of class instances (each one identified by its name)
G4String theName;
source/persistency/ascii/include/G4tgrFileReader.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrFileReader.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrFileReader
@@ -69,7 +69,7 @@ class G4tgrFileReader
private:
static G4tgrFileReader* theInstance;
static G4ThreadLocal G4tgrFileReader* theInstance;
std::vector<G4String> theTextFiles;
G4tgrLineProcessor* theLineProcessor;
source/persistency/ascii/include/G4tgrIsotope.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrIsotope.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrIsotope
source/persistency/ascii/include/G4tgrLineProcessor.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrLineProcessor.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrIsotope
source/persistency/ascii/include/G4tgrMaterial.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterial.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrMaterial
source/persistency/ascii/include/G4tgrMaterialFactory.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterialFactory.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrMaterialFactory
@@ -111,7 +111,7 @@ class G4tgrMaterialFactory
const G4bool bNoRepeating = true );
private:
static G4tgrMaterialFactory* theInstance;
static G4ThreadLocal G4tgrMaterialFactory* theInstance;
G4mstgrisot theG4tgrIsotopes;
// List of all G4tgrIsotopes created
source/persistency/ascii/include/G4tgrMaterialMixture.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterialMixture.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrMaterialMixture
source/persistency/ascii/include/G4tgrMaterialSimple.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterialSimple.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrMaterialSimple
source/persistency/ascii/include/G4tgrMessenger.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMessenger.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrMessenger
@@ -62,7 +62,7 @@ class G4tgrMessenger : public G4UImessenger
G4UIdirectory* tgDirectory;
G4UIcmdWithAnInteger* verboseCmd;
static G4int theVerboseLevel;
static G4ThreadLocal G4int theVerboseLevel;
};
#endif
source/persistency/ascii/include/G4tgrParameterMgr.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrParameterMgr.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrParameterMgr
@@ -81,7 +81,7 @@ class G4tgrParameterMgr
// Map of Parameter's: G4String is the Parameter name,
// double is its value
static G4tgrParameterMgr* theInstance;
static G4ThreadLocal G4tgrParameterMgr* theInstance;
};
#endif
source/persistency/ascii/include/G4tgrPlace.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlace.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlace
source/persistency/ascii/include/G4tgrPlaceDivRep.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlaceDivRep.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlaceDivRep
source/persistency/ascii/include/G4tgrPlaceParameterisation.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlaceParameterisation.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlaceParameterisation
source/persistency/ascii/include/G4tgrPlaceSimple.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlaceSimple.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlaceSimple
source/persistency/ascii/include/G4tgrRotationMatrix.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrRotationMatrix.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrRotationMatrix
source/persistency/ascii/include/G4tgrRotationMatrixFactory.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrRotationMatrixFactory.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrRotationMatrixFactory
@@ -76,7 +76,7 @@ class G4tgrRotationMatrixFactory
private:
static G4tgrRotationMatrixFactory* theInstance;
static G4ThreadLocal G4tgrRotationMatrixFactory* theInstance;
std::vector<G4tgrRotationMatrix*> theTgrRotMatList;
G4mstgrrotm theTgrRotMats;
source/persistency/ascii/include/G4tgrSolid.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrSolid.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrSolid
source/persistency/ascii/include/G4tgrSolidBoolean.hh
+5 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrSolidBoolean.hh 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgrSolidBoolean
@@ -83,10 +83,11 @@ inline const G4tgrSolid* G4tgrSolidBoolean::GetSolid( G4int ii ) const
{
if((ii != 0) && (ii != 1))
{
G4String ErrMessage = "Only two G4tgrSolids (0,1) possible ! Asking for... "
+ ii;
std::ostringstream message;
message << "Only two G4tgrSolids (0,1) possible ! Asking for... "
<< ii;
G4Exception("G4tgrSolidBoolean::GetSolid()", "InvalidInput",
FatalException, ErrMessage);
FatalException, message);
}
return theSolids[ii];
}
source/persistency/ascii/include/G4tgrUtils.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrUtils.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrUtils
@@ -105,7 +105,7 @@ class G4tgrUtils
private:
static G4tgrEvaluator* theEvaluator;
static G4ThreadLocal G4tgrEvaluator* theEvaluator;
};
#endif
source/persistency/ascii/include/G4tgrVolume.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolume.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrVolume
source/persistency/ascii/include/G4tgrVolumeAssembly.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolumeAssembly.hh 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrVolumeAssembly
source/persistency/ascii/include/G4tgrVolumeDivision.hh
+3 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolumeDivision.hh 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgrVolumeDivision
@@ -63,13 +63,10 @@ class G4tgrVolumeDivision : public G4tgrVolume
G4tgrVolumeDivision( const std::vector<G4String>& wl );
~G4tgrVolumeDivision();
G4bool SetSolid(G4tgrVolume* parentDU, G4bool byStep,
EAxis axis, G4double div_step, G4double offset);
// G4bool SetSolid(G4tgrVolume* parentDU, G4bool byStep,
// EAxis axis, G4double div_step, G4double offset);
// Set the solid type and parameters dividing the mother volune
static void SetSupportedAxis();
// Set the list of supported axis for each solid types
G4tgrPlaceDivRep* GetPlaceDivision() { return thePlaceDiv; }
friend std::ostream& operator<<(std::ostream& os,
@@ -77,7 +74,6 @@ class G4tgrVolumeDivision : public G4tgrVolume
private:
G4tgrPlaceDivRep* thePlaceDiv;
static G4mmss theSupportedAxis;
};
#endif
source/persistency/ascii/include/G4tgrVolumeMgr.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolumeMgr.hh 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrVolumeMgr
@@ -140,7 +140,7 @@ class G4tgrVolumeMgr
// Hierarchy tree of G4tgrVolume's: G4String is the name
// of the parent G4tgrVolume, G4tgrPlace* the pointers to children
static G4tgrVolumeMgr* theInstance;
static G4ThreadLocal G4tgrVolumeMgr* theInstance;
std::vector<G4tgrVolume*> theG4tgrVolumeList;
std::vector<G4tgrPlace*> theG4tgrPlaceList;
source/persistency/ascii/sources.cmake
+1 -3
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake,v 1.1 2010-09-29 18:50:05 bmorgan Exp $
# $Id: sources.cmake 66363 2012-12-18 09:12:54Z gcosmo $
#
#------------------------------------------------------------------------------
@@ -21,7 +21,6 @@ include_directories(${CLHEP_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/divisions/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/BREPS/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/Boolean/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/CSG/include)
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/specific/include)
@@ -137,7 +136,6 @@ GEANT4_DEFINE_MODULE(NAME G4geomtext
G4tgrVolumeDivision.cc
G4tgrVolumeMgr.cc
GRANULAR_DEPENDENCIES
G4brep
G4csg
G4geomBoolean
G4geomdivision
source/persistency/ascii/src/G4tgbDetectorBuilder.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbDetectorBuilder.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbDetectorBuilder
source/persistency/ascii/src/G4tgbDetectorConstruction.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbDetectorConstruction.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbDetectorConstruction
source/persistency/ascii/src/G4tgbElement.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbElement.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbElement
source/persistency/ascii/src/G4tgbGeometryDumper.cc
+23 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbGeometryDumper.cc 77346 2013-11-22 16:01:16Z gcosmo $
// GEANT4 tag $Name: $
//
//
@@ -54,6 +54,7 @@
#include "G4Torus.hh"
#include "G4Hype.hh"
#include "G4Polycone.hh"
#include "G4GenericPolycone.hh"
#include "G4Polyhedra.hh"
#include "G4EllipticalTube.hh"
#include "G4Ellipsoid.hh"
@@ -77,7 +78,7 @@
#include <iomanip>
//------------------------------------------------------------------------
G4tgbGeometryDumper* G4tgbGeometryDumper::theInstance = 0;
G4ThreadLocal G4tgbGeometryDumper* G4tgbGeometryDumper::theInstance = 0;
//------------------------------------------------------------------------
G4tgbGeometryDumper::G4tgbGeometryDumper()
@@ -869,6 +870,26 @@ std::vector<G4double> G4tgbGeometryDumper::GetSolidParams( const G4VSolid * so)
params.push_back( plc->GetOriginalParameters()->Opening_angle/deg );
params.push_back( ncor );
for( G4int ii = 0; ii < ncor; ii++ )
{
params.push_back( plc->GetCorner(ii).r );
params.push_back( plc->GetCorner(ii).z );
}
}
} else if (solidType == "GENERICPOLYCONE") {
//--- Dump RZ corners
const G4GenericPolycone * plc =
dynamic_cast < const G4GenericPolycone * > (so);
if (plc) {
G4double angphi = plc->GetStartPhi()/deg;
if( angphi > 180*deg ) { angphi -= 360*deg; }
G4double endphi = plc->GetEndPhi()/deg;
if( endphi > 180*deg ) { endphi -= 360*deg; }
G4int ncor = plc->GetNumRZCorner();
params.push_back( angphi );
params.push_back( endphi-angphi );
params.push_back( ncor );
for( G4int ii = 0; ii < ncor; ii++ )
{
params.push_back( plc->GetCorner(ii).r );
source/persistency/ascii/src/G4tgbIsotope.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbIsotope.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbIsotope
source/persistency/ascii/src/G4tgbMaterial.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterial.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterial
source/persistency/ascii/src/G4tgbMaterialMgr.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMgr.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgbMaterialMgr
@@ -47,7 +47,7 @@
#include "G4NistManager.hh"
G4tgbMaterialMgr* G4tgbMaterialMgr::theInstance = 0;
G4ThreadLocal G4tgbMaterialMgr* G4tgbMaterialMgr::theInstance = 0;
// -------------------------------------------------------------------------
source/persistency/ascii/src/G4tgbMaterialMixture.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixture.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixture
source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixtureByNoAtoms.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixtureByNoAtoms
source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixtureByVolume.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixtureByVolume
source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialMixtureByWeight.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialMixtureByWeight
source/persistency/ascii/src/G4tgbMaterialSimple.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbMaterialSimple.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbMaterialSimple
source/persistency/ascii/src/G4tgbPlaceParamCircle.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParamCircle.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamCircle
source/persistency/ascii/src/G4tgbPlaceParamLinear.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParamLinear.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamLinear
source/persistency/ascii/src/G4tgbPlaceParamSquare.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParamSquare.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgbPlaceParamSquare
source/persistency/ascii/src/G4tgbPlaceParameterisation.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbPlaceParameterisation.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
// class G4tgbPlaceParameterisation
source/persistency/ascii/src/G4tgbRotationMatrix.cc
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbRotationMatrix.cc 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgbRotationMatrix
@@ -41,7 +41,7 @@
// -------------------------------------------------------------------------
G4tgbRotationMatrix::G4tgbRotationMatrix()
: theTgrRM(0), theG4RM(0)
: theTgrRM(0)
{
}
@@ -54,7 +54,7 @@ G4tgbRotationMatrix::~G4tgbRotationMatrix()
// -------------------------------------------------------------------------
G4tgbRotationMatrix::G4tgbRotationMatrix( G4tgrRotationMatrix* tgr )
: theTgrRM(tgr), theG4RM(0)
: theTgrRM(tgr)
{
}
source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbRotationMatrixMgr.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgbRotationMatrixMgr
@@ -41,7 +41,7 @@
// -------------------------------------------------------------------------
G4tgbRotationMatrixMgr * G4tgbRotationMatrixMgr::theInstance = 0;
G4ThreadLocal G4tgbRotationMatrixMgr * G4tgbRotationMatrixMgr::theInstance = 0;
// -------------------------------------------------------------------------
source/persistency/ascii/src/G4tgbVolume.cc
+29 -137
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbVolume.cc 77356 2013-11-22 17:10:29Z gcosmo $
//
//
// class G4tgbVolume
@@ -77,6 +77,7 @@
#include "G4Torus.hh"
#include "G4Hype.hh"
#include "G4Polycone.hh"
#include "G4GenericPolycone.hh"
#include "G4Polyhedra.hh"
#include "G4EllipticalTube.hh"
#include "G4Ellipsoid.hh"
@@ -88,14 +89,6 @@
#include "G4TwistedTrd.hh"
#include "G4TwistedTubs.hh"
#include "G4AssemblyVolume.hh"
#include "G4BREPSolidBox.hh"
#include "G4BREPSolidCylinder.hh"
#include "G4BREPSolidCone.hh"
#include "G4BREPSolidSphere.hh"
#include "G4BREPSolidTorus.hh"
#include "G4BREPSolidPCone.hh"
#include "G4BREPSolidPolyhedra.hh"
#include "G4BREPSolidOpenPCone.hh"
#include "G4TessellatedSolid.hh"
#include "G4TriangularFacet.hh"
#include "G4QuadrangularFacet.hh"
@@ -161,10 +154,6 @@ void G4tgbVolume::ConstructG4Volumes( const G4tgrPlace* place,
g4vmgr->RegisterMe( logvol );
g4vmgr->RegisterChildParentLVs( logvol, parentLV );
}
else
{
return;
}
}
else
{
@@ -362,11 +351,11 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
G4bool genericPoly = false;
if( solParam.size() == 3+nplanes*3 )
{
genericPoly = true;
genericPoly = false;
}
else if( solParam.size() == 3+nplanes*2 )
{
genericPoly = false;
genericPoly = true;
}
else
{
@@ -383,7 +372,7 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
return 0;
}
if( genericPoly )
if( !genericPoly )
{
std::vector<G4double>* z_p = new std::vector<G4double>;
std::vector<G4double>* rmin_p = new std::vector<G4double>;
@@ -411,7 +400,8 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
}
G4double phiTotal = solParam[1];
if( std::fabs(phiTotal - twopi) < angularTolerance ) { phiTotal = twopi; }
solid = new G4Polycone( sname, solParam[0], phiTotal, // start,delta-phi
solid = new G4GenericPolycone( sname,
solParam[0], phiTotal, // start,delta-phi
nplanes, // sections
&((*R_c)[0]), &((*Z_c)[0]));
}
@@ -444,7 +434,7 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
return 0;
}
if( genericPoly )
if( !genericPoly )
{
std::vector<G4double>* z_p = new std::vector<G4double>;
std::vector<G4double>* rmin_p = new std::vector<G4double>;
@@ -536,123 +526,6 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
solid = new G4TwistedTubs( sname, solParam[0], solParam[1], solParam[2],
solParam[3], phiTotal);
}
else if( stype == "BREPBOX" ) // EntityType is = "Closed_Shell"
{
CheckNoSolidParams( stype, 24, solParam.size() );
std::vector<G4Point3D> points;
for( size_t ii = 0; ii < 8; ii++ )
{
points.push_back( G4Point3D(solParam[ii*3+0],
solParam[ii*3+1],
solParam[ii*3+2]) );
}
solid = new G4BREPSolidBox( sname, points[0], points[1], points[2],
points[3], points[4], points[5], points[6],
points[7] );
}
else if( stype == "BREPCYLINDER" ) // EntityType is = "Closed_Shell"
{
CheckNoSolidParams( stype, 11, solParam.size() );
solid = new G4BREPSolidCylinder( sname,
G4ThreeVector( solParam[0], solParam[1], solParam[2] ),
G4ThreeVector( solParam[3], solParam[4], solParam[5] ),
G4ThreeVector( solParam[6], solParam[7], solParam[8] ),
solParam[9], solParam[10] );
}
else if( stype == "BREPCONE" ) // EntityType is = "Closed_Shell"
{
CheckNoSolidParams( stype, 12, solParam.size() );
solid = new G4BREPSolidCone( sname,
G4ThreeVector( solParam[0], solParam[1], solParam[2] ),
G4ThreeVector( solParam[3], solParam[4], solParam[5] ),
G4ThreeVector( solParam[6], solParam[7], solParam[8] ),
solParam[9], solParam[10], solParam[11] );
}
else if( stype == "BREPSPHERE" ) // EntityType is = "Closed_Shell"
{
CheckNoSolidParams( stype, 10, solParam.size() );
solid = new G4BREPSolidSphere( sname,
G4ThreeVector( solParam[0], solParam[1], solParam[2] ),
G4ThreeVector( solParam[3], solParam[4], solParam[5] ),
G4ThreeVector( solParam[6], solParam[7], solParam[8] ),
solParam[9] );
}
else if( stype == "BREPTORUS" ) // EntityType is = "Closed_Shell"
{
CheckNoSolidParams( stype, 11, solParam.size() );
solid = new G4BREPSolidTorus( sname,
G4ThreeVector( solParam[0], solParam[1], solParam[2] ),
G4ThreeVector( solParam[3], solParam[4], solParam[5] ),
G4ThreeVector( solParam[6], solParam[7], solParam[8] ),
solParam[9], solParam[10] );
}
else if( stype == "BREPPCONE" ) // EntityType is = "Closed_Shell"
{
size_t nplanes = size_t(solParam[2]);
CheckNoSolidParams( stype, 4+3*nplanes, solParam.size() );
std::vector<G4double>* z_p = new std::vector<G4double>;
std::vector<G4double>* rmin_p = new std::vector<G4double>;
std::vector<G4double>* rmax_p = new std::vector<G4double>;
for( size_t ii = 0; ii < nplanes; ii++ )
{
(*z_p).push_back( solParam[4+3*ii] );
(*rmin_p).push_back( solParam[4+3*ii+1] );
(*rmax_p).push_back( solParam[4+3*ii+2] );
}
G4double phiTotal = solParam[1];
if( std::fabs(phiTotal - twopi) < angularTolerance ) { phiTotal = twopi; }
CheckNoSolidParams( stype, 12, solParam.size() );
solid = new G4BREPSolidPCone( sname, solParam[0], phiTotal, // start,dph
nplanes, // sections
solParam[3], // z_start
&((*z_p)[0]), &((*rmin_p)[0]),
&((*rmax_p)[0]));
}
else if( stype == "BREPPOLYHEDRA" ) // EntityType is = "Closed_Shell"
{
size_t nplanes = size_t(solParam[3]);
CheckNoSolidParams( stype, 5+3*nplanes, solParam.size() );
std::vector<G4double>* z_p = new std::vector<G4double>;
std::vector<G4double>* rmin_p = new std::vector<G4double>;
std::vector<G4double>* rmax_p = new std::vector<G4double>;
for( size_t ii = 0; ii < nplanes; ii++ )
{
(*z_p).push_back( solParam[5+3*ii] );
(*rmin_p).push_back( solParam[5+3*ii+1] );
(*rmax_p).push_back( solParam[5+3*ii+2] );
}
G4double phiTotal = solParam[1];
if( std::fabs(phiTotal - twopi) < angularTolerance ) { phiTotal = twopi; }
CheckNoSolidParams( stype, 12, solParam.size() );
solid = new G4BREPSolidPolyhedra( sname, solParam[0], phiTotal, // start,dph
G4int(solParam[2]), // sides
nplanes, // sections
solParam[4], // z_start
&((*z_p)[0]), &((*rmin_p)[0]),
&((*rmax_p)[0]));
}
else if( stype == "BREPOPENPCONE" ) // EntityType is = "Closed_Shell"
{
size_t nplanes = size_t(solParam[2]);
std::vector<G4double>* z_p = new std::vector<G4double>;
std::vector<G4double>* rmin_p = new std::vector<G4double>;
std::vector<G4double>* rmax_p = new std::vector<G4double>;
for( size_t ii = 0; ii < nplanes; ii++ )
{
(*z_p).push_back( solParam[4+3*ii] );
(*rmin_p).push_back( solParam[4+3*ii+1] );
(*rmax_p).push_back( solParam[4+3*ii+2] );
}
G4double phiTotal = solParam[1];
if( std::fabs(phiTotal - twopi) < angularTolerance ) { phiTotal = twopi; }
CheckNoSolidParams( stype, 12, solParam.size() );
solid = new G4BREPSolidOpenPCone( sname, solParam[0], phiTotal, // start,dph
nplanes, // sections
solParam[3], // z_start
&((*z_p)[0]), &((*rmin_p)[0]),
&((*rmax_p)[0]));
}
else if( stype == "TESSELLATED" )
{
G4int nFacets = G4int(solParam[0]);
@@ -1328,7 +1201,8 @@ G4VSolid* G4tgbVolume::BuildSolidForDivision( G4VSolid* parentSolid, EAxis axis
solid = new G4Tubs( GetName(), psolid->GetInnerRadius()*redf,
psolid->GetOuterRadius()*redf,
psolid->GetZHalfLength()*redf,
psolid->GetSPhi(), psolid->GetDPhi());
psolid->GetStartPhiAngle(),
psolid->GetDeltaPhiAngle());
}
else if ( parentSolid->GetEntityType() == "G4Cons" )
{
@@ -1338,7 +1212,8 @@ G4VSolid* G4tgbVolume::BuildSolidForDivision( G4VSolid* parentSolid, EAxis axis
psolid->GetInnerRadiusPlusZ()*redf,
psolid->GetOuterRadiusPlusZ()*redf,
psolid->GetZHalfLength()*redf,
psolid->GetSPhi(), psolid->GetDPhi());
psolid->GetStartPhiAngle(),
psolid->GetDeltaPhiAngle());
}
else if ( parentSolid->GetEntityType() == "G4Trd" )
{
@@ -1387,6 +1262,23 @@ G4VSolid* G4tgbVolume::BuildSolidForDivision( G4VSolid* parentSolid, EAxis axis
origParam.Num_z_planes, origParam.Z_values,
origParam.Rmin, origParam.Rmax);
}
else if ( parentSolid->GetEntityType() == "G4GenericPolycone" )
{
G4GenericPolycone* psolid = (G4GenericPolycone*)(parentSolid);
const G4int numRZ = psolid->GetNumRZCorner();
G4double* r = new G4double[numRZ];
G4double* z = new G4double[numRZ];
for( G4int ii = 0; ii < numRZ; ii++ )
{
r[ii] = psolid->GetCorner(ii).r;
z[ii] = psolid->GetCorner(ii).z;
}
solid = new G4GenericPolycone( GetName(), psolid->GetStartPhi(),
psolid->GetEndPhi() - psolid->GetStartPhi(),
numRZ, r, z);
delete [] r; delete [] z;
}
else if ( parentSolid->GetEntityType() == "G4Polyhedra" )
{
source/persistency/ascii/src/G4tgbVolumeMgr.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgbVolumeMgr.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgbVolumeMgr
@@ -50,7 +50,7 @@
#include "G4tgrMessenger.hh"
#include "G4tgbDetectorBuilder.hh"
G4tgbVolumeMgr* G4tgbVolumeMgr::theInstance = 0;
G4ThreadLocal G4tgbVolumeMgr* G4tgbVolumeMgr::theInstance = 0;
//---------------------------------------------------------------------
G4tgbVolumeMgr::G4tgbVolumeMgr()
source/persistency/ascii/src/G4tgrElement.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrElement.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrElement
source/persistency/ascii/src/G4tgrElementFromIsotopes.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrElementFromIsotopes.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrElementFromIsotopes
source/persistency/ascii/src/G4tgrElementSimple.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrElementSimple.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrElementSimple
source/persistency/ascii/src/G4tgrEvaluator.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrEvaluator.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrEvaluator
source/persistency/ascii/src/G4tgrFileIn.cc
+11 -9
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrFileIn.cc 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgrFileIn
@@ -44,22 +44,23 @@
#include "G4tgrUtils.hh"
#include "G4UIcommand.hh"
std::vector<G4tgrFileIn*> G4tgrFileIn::theInstances;
G4ThreadLocal std::vector<G4tgrFileIn*> *G4tgrFileIn::theInstances = 0;
//-----------------------------------------------------------------------
G4tgrFileIn::G4tgrFileIn()
: theCurrentFile(-1), theName("")
{
if (!theInstances) { theInstances = new std::vector<G4tgrFileIn*>; }
}
//-----------------------------------------------------------------------
G4tgrFileIn::~G4tgrFileIn()
{
delete theInstances; theInstances=0;
/*
std::vector<G4tgrFileIn*>::const_iterator vfcite;
for( vfcite = theInstances.begin(); vfcite != theInstances.end(); vfcite++)
for( vfcite = theInstances->begin(); vfcite != theInstances->end(); vfcite++)
{
delete *vfcite;
}
@@ -70,8 +71,10 @@ G4tgrFileIn::~G4tgrFileIn()
//-----------------------------------------------------------------------
G4tgrFileIn& G4tgrFileIn::GetInstance( const G4String& filename )
{
if (!theInstances) { theInstances = new std::vector<G4tgrFileIn*>; }
std::vector<G4tgrFileIn*>::const_iterator vfcite;
for( vfcite = theInstances.begin(); vfcite != theInstances.end(); vfcite++)
for( vfcite = theInstances->begin(); vfcite != theInstances->end(); vfcite++)
{
if( (*vfcite)->GetName() == filename)
{
@@ -80,14 +83,14 @@ G4tgrFileIn& G4tgrFileIn::GetInstance( const G4String& filename )
}
G4tgrFileIn* instance = 0;
if( vfcite == theInstances.end() )
if( vfcite == theInstances->end() )
{
instance = new G4tgrFileIn( filename );
instance->theCurrentFile = -1;
instance->OpenNewFile( filename.c_str() );
theInstances.push_back( instance );
theInstances->push_back( instance );
}
return *instance;
@@ -96,7 +99,7 @@ G4tgrFileIn& G4tgrFileIn::GetInstance( const G4String& filename )
//-----------------------------------------------------------------------
void G4tgrFileIn::OpenNewFile( const char* filename )
{
{
theCurrentFile++;
std::ifstream* fin = new std::ifstream(filename);
theFiles.push_back(fin);
@@ -119,7 +122,6 @@ void G4tgrFileIn::OpenNewFile( const char* filename )
//-----------------------------------------------------------------------
G4tgrFileIn& G4tgrFileIn::GetInstanceOpened( const G4String& filename )
{
G4tgrFileIn& filein = G4tgrFileIn::GetInstance(filename);
if (filein.GetName() != filename )
{
source/persistency/ascii/src/G4tgrFileReader.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrFileReader.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrFileReader
@@ -50,7 +50,7 @@
#include "G4tgrMessenger.hh"
G4tgrFileReader* G4tgrFileReader::theInstance = 0;
G4ThreadLocal G4tgrFileReader* G4tgrFileReader::theInstance = 0;
//---------------------------------------------------------------
source/persistency/ascii/src/G4tgrIsotope.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrIsotope.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrIsotope
source/persistency/ascii/src/G4tgrMaterial.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterial.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrMaterial
source/persistency/ascii/src/G4tgrMaterialFactory.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterialFactory.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrMaterialFactory
@@ -43,7 +43,7 @@
#include "G4tgrMessenger.hh"
G4tgrMaterialFactory* G4tgrMaterialFactory::theInstance = 0;
G4ThreadLocal G4tgrMaterialFactory* G4tgrMaterialFactory::theInstance = 0;
//-------------------------------------------------------------
source/persistency/ascii/src/G4tgrMaterialMixture.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterialMixture.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrMaterialMixture
source/persistency/ascii/src/G4tgrMaterialSimple.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMaterialSimple.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrMaterialSimple
source/persistency/ascii/src/G4tgrMessenger.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrMessenger.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrMessenger
@@ -38,7 +38,7 @@
#include "G4UIcmdWithoutParameter.hh"
#include "G4UIcmdWithAnInteger.hh"
G4int G4tgrMessenger::theVerboseLevel = 0;
G4ThreadLocal G4int G4tgrMessenger::theVerboseLevel = 0;
// --------------------------------------------------------------------
source/persistency/ascii/src/G4tgrParameterMgr.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrParameterMgr.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrParameterMgr
@@ -41,7 +41,7 @@
#include "G4tgrMessenger.hh"
#include "G4UIcommand.hh"
G4tgrParameterMgr* G4tgrParameterMgr::theInstance = 0;
G4ThreadLocal G4tgrParameterMgr* G4tgrParameterMgr::theInstance = 0;
//-------------------------------------------------------------
source/persistency/ascii/src/G4tgrPlace.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlace.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlace
source/persistency/ascii/src/G4tgrPlaceDivRep.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlaceDivRep.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlaceDivRep
source/persistency/ascii/src/G4tgrPlaceParameterisation.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlaceParameterisation.cc 73052 2013-08-15 15:45:36Z gcosmo $
//
//
// class G4tgrPlaceParameterisation
@@ -94,7 +94,7 @@ std::ostream& operator<<(std::ostream& os,
os << "G4tgrPlaceParameterisation= in " << obj.theParentName
<< " ParamTyep = " << obj.theParamType
<< " RotMatName= " << obj.theRotMatName << " EXTRA DATA= ";
for( size_t ii = 0; ii << obj.theExtraData.size(); ii++ )
for( size_t ii = 0; ii < obj.theExtraData.size(); ii++ )
{
os << obj.theExtraData[ii] << " ";
}
source/persistency/ascii/src/G4tgrPlaceSimple.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrPlaceSimple.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrPlaceSimple
source/persistency/ascii/src/G4tgrRotationMatrix.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrRotationMatrix.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrRotationMatrix
source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrRotationMatrixFactory.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrRotationMatrixFactory
@@ -38,7 +38,7 @@
#include "G4tgrUtils.hh"
G4tgrRotationMatrixFactory * G4tgrRotationMatrixFactory::theInstance = 0;
G4ThreadLocal G4tgrRotationMatrixFactory * G4tgrRotationMatrixFactory::theInstance = 0;
// -------------------------------------------------------------------------
source/persistency/ascii/src/G4tgrSolid.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrSolid.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrSolid
source/persistency/ascii/src/G4tgrSolidBoolean.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrSolidBoolean.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrSolidBoolean
source/persistency/ascii/src/G4tgrUtils.cc
+5 -3
View File
@@ -45,18 +45,20 @@
#include "G4UIcommand.hh"
G4tgrEvaluator* G4tgrUtils::theEvaluator = new G4tgrEvaluator;
G4ThreadLocal G4tgrEvaluator* G4tgrUtils::theEvaluator = 0 ;
//-------------------------------------------------------------
G4tgrUtils::G4tgrUtils()
{
if (!theEvaluator) { theEvaluator= new G4tgrEvaluator; }
}
//-------------------------------------------------------------
G4tgrUtils::~G4tgrUtils()
{
delete theEvaluator; theEvaluator = 0;
}
@@ -202,6 +204,7 @@ G4String G4tgrUtils::GetString( const G4String& str )
//-------------------------------------------------------------
G4double G4tgrUtils::GetDouble( const G4String& str, G4double unitval )
{
if (!theEvaluator) { theEvaluator= new G4tgrEvaluator; }
#ifdef G4VERBOSE
if( G4tgrMessenger::GetVerboseLevel() >= 3 )
{
@@ -473,7 +476,6 @@ void G4tgrUtils::CheckWLsize( const std::vector<G4String>& wl,
unsigned int nWcheck, WLSIZEtype st,
const G4String& methodName )
{
G4String outStr = methodName + G4String(". Line read with number of words ");
unsigned int wlsize = wl.size();
@@ -577,7 +579,7 @@ G4bool G4tgrUtils::WordIsUnit( const G4String& word )
|| word == "mrad"
|| word == "deg"
|| word == "ns"
|| word == "curie"
|| word == "becquerel"
|| word == "curie" )
{
return true;
source/persistency/ascii/src/G4tgrVolume.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolume.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrVolume
source/persistency/ascii/src/G4tgrVolumeAssembly.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolumeAssembly.cc 66363 2012-12-18 09:12:54Z gcosmo $
//
//
// class G4tgrVolumeAssembly
source/persistency/ascii/src/G4tgrVolumeDivision.cc
+1 -5
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolumeDivision.cc 68052 2013-03-13 14:38:53Z gcosmo $
//
//
// class G4tgrVolumeDivision
@@ -44,15 +44,11 @@
#include "G4tgrMessenger.hh"
G4mmss G4tgrVolumeDivision::theSupportedAxis;
//-------------------------------------------------------------
G4tgrVolumeDivision::~G4tgrVolumeDivision()
{
}
//-------------------------------------------------------------
G4tgrVolumeDivision::G4tgrVolumeDivision( const std::vector<G4String>& wl )
{
source/persistency/ascii/src/G4tgrVolumeMgr.cc
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4tgrVolumeMgr.cc 66872 2013-01-15 01:25:57Z japost $
//
//
// class G4tgrVolumeMgr
@@ -43,7 +43,7 @@
#include "G4tgrSolidBoolean.hh"
G4tgrVolumeMgr* G4tgrVolumeMgr::theInstance = 0;
G4ThreadLocal G4tgrVolumeMgr* G4tgrVolumeMgr::theInstance = 0;
//-------------------------------------------------------------
source/persistency/gdml/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:50:13 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More