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

Import Geant4 9.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/ascii/src/G4tgbDetectorBuilder.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbDetectorBuilder.cc,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbDetectorBuilder
source/persistency/ascii/src/G4tgbDetectorConstruction.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbDetectorConstruction.cc,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbDetectorConstruction
source/persistency/ascii/src/G4tgbElement.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbElement.cc,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbElement
source/persistency/ascii/src/G4tgbGeometryDumper.cc
+9 -8
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbGeometryDumper.cc,v 1.15 2010-11-02 11:13:05 gcosmo Exp $
// $Id$
// GEANT4 tag $Name: $
//
//
@@ -38,6 +38,7 @@
#include "G4tgrMessenger.hh"
#include "G4SystemOfUnits.hh"
#include "G4UIcommand.hh"
#include "G4Material.hh"
#include "G4Element.hh"
@@ -859,19 +860,19 @@ std::vector<G4double> G4tgbGeometryDumper::GetSolidParams( const G4VSolid * so)
} else if (solidType == "POLYCONE") {
//--- Dump RZ corners, as original parameters will not be present
// if it was build from RZ corners
const G4Polycone * pc = dynamic_cast < const G4Polycone * > (so);
if (pc) {
G4double angphi = pc->GetStartPhi()/deg;
const G4Polycone * plc = dynamic_cast < const G4Polycone * > (so);
if (plc) {
G4double angphi = plc->GetStartPhi()/deg;
if( angphi > 180*deg ) { angphi -= 360*deg; }
G4int ncor = pc->GetNumRZCorner();
G4int ncor = plc->GetNumRZCorner();
params.push_back( angphi );
params.push_back( pc->GetOriginalParameters()->Opening_angle/deg );
params.push_back( plc->GetOriginalParameters()->Opening_angle/deg );
params.push_back( ncor );
for( G4int ii = 0; ii < ncor; ii++ )
{
params.push_back( pc->GetCorner(ii).r );
params.push_back( pc->GetCorner(ii).z );
params.push_back( plc->GetCorner(ii).r );
params.push_back( plc->GetCorner(ii).z );
}
}
} else if (solidType == "POLYHEDRA") {
source/persistency/ascii/src/G4tgbIsotope.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbIsotope.cc,v 1.6 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbIsotope
source/persistency/ascii/src/G4tgbMaterial.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterial.cc,v 1.5 2010-12-15 11:29:54 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterial
source/persistency/ascii/src/G4tgbMaterialMgr.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterialMgr.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterialMgr
source/persistency/ascii/src/G4tgbMaterialMixture.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterialMixture.cc,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterialMixture
source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterialMixtureByNoAtoms.cc,v 1.7 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterialMixtureByNoAtoms
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgbMaterialMixtureByNoAtoms.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgbMaterial.hh"
#include "G4tgbMaterialMgr.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterialMixtureByVolume.cc,v 1.9 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterialMixtureByVolume
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgbMaterialMixtureByVolume.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgbMaterial.hh"
#include "G4tgbMaterialMgr.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterialMixtureByWeight.cc,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterialMixtureByWeight
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgbMaterialMixtureByWeight.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgbMaterial.hh"
#include "G4tgbMaterialMgr.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgbMaterialSimple.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbMaterialSimple.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbMaterialSimple
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgbMaterialSimple.hh"
#include "G4PhysicalConstants.hh"
#include "G4tgrMaterialSimple.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgbPlaceParamCircle.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbPlaceParamCircle.cc,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbPlaceParamCircle
source/persistency/ascii/src/G4tgbPlaceParamLinear.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbPlaceParamLinear.cc,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbPlaceParamLinear
source/persistency/ascii/src/G4tgbPlaceParamSquare.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbPlaceParamSquare.cc,v 1.7 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbPlaceParamSquare
source/persistency/ascii/src/G4tgbPlaceParameterisation.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbPlaceParameterisation.cc,v 1.6 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
// class G4tgbPlaceParameterisation
source/persistency/ascii/src/G4tgbRotationMatrix.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbRotationMatrix.cc,v 1.10 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbRotationMatrix
source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbRotationMatrixMgr.cc,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbRotationMatrixMgr
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgbRotationMatrixMgr.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrRotationMatrixFactory.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgbVolume.cc
+6 -4
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbVolume.cc,v 1.23 2010-11-05 08:58:36 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbVolume
@@ -35,6 +34,9 @@
// -------------------------------------------------------------------------
#include "G4tgbVolume.hh"
#include "G4PhysicalConstants.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgbVolumeMgr.hh"
#include "G4tgbMaterialMgr.hh"
#include "G4tgbRotationMatrixMgr.hh"
@@ -681,7 +683,7 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
{
vertexType = ABSOLUTE;
}
else if( solParam[jj+11] == 0 )
else if( solParam[jj+11] == 1 )
{
vertexType = RELATIVE;
}
@@ -708,7 +710,7 @@ G4VSolid* G4tgbVolume::FindOrConstructG4Solid( const G4tgrSolid* sol )
{
vertexType = ABSOLUTE;
}
else if( solParam[jj+14] == 0 )
else if( solParam[jj+14] == 1 )
{
vertexType = RELATIVE;
}
source/persistency/ascii/src/G4tgbVolumeMgr.cc
+4 -3
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgbVolumeMgr.cc,v 1.10 2010-12-15 11:29:54 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgbVolumeMgr
@@ -34,8 +33,10 @@
// - Created. P.Arce, CIEMAT (November 2007)
// -------------------------------------------------------------------------
#include "G4tgbVolume.hh"
#include "G4tgbVolumeMgr.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgbVolume.hh"
#include "G4tgbMaterialMgr.hh"
#include "G4tgbRotationMatrixMgr.hh"
source/persistency/ascii/src/G4tgrElement.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrElement.cc,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrElement
source/persistency/ascii/src/G4tgrElementFromIsotopes.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrElementFromIsotopes.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrElementFromIsotopes
source/persistency/ascii/src/G4tgrElementSimple.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrElementSimple.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrElementSimple
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrElementSimple.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgrEvaluator.cc
+3 -4
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrEvaluator.cc,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrEvaluator
@@ -52,9 +51,9 @@ G4tgrEvaluator::~G4tgrEvaluator()
// -------------------------------------------------------------------------
void G4tgrEvaluator::print_error( G4int status ) const
void G4tgrEvaluator::print_error( G4int estatus ) const
{
switch (status)
switch (estatus)
{
case ERROR_SYNTAX_ERROR:
G4cerr << "G4tgrEvaluator: syntax error!" << G4endl;
source/persistency/ascii/src/G4tgrFileIn.cc
+11 -13
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrFileIn.cc,v 1.13 2010-12-15 11:29:54 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrFileIn
@@ -220,13 +219,12 @@ G4int G4tgrFileIn::GetWordsInLine( std::vector<G4String>& wordlist)
tt++;
} while((*tt != '\0') && (stemp.length()!=0));
G4String stempt (ltemp);
if(stempt.length() == 0) { NoWords = 0; }
if(stemp.length() == 0) { NoWords = 0; }
//--------- Read words from istr_line and write them into wordlist
for( ii=0; ii < NoWords; ii++)
{
G4String stemp = "";
stemp = "";
istr_line >> stemp;
if ( stemp.length() == 0 ) { break; }
G4int comment = stemp.find(G4String("//") );
@@ -276,13 +274,13 @@ G4int G4tgrFileIn::GetWordsInLine( std::vector<G4String>& wordlist)
std::vector<G4String> wordlist2;
G4String wordq = "";
unsigned int imerge = 0;
for( size_t ii = 0; ii < wordlist.size(); ii++)
for( size_t jj = 0; jj < wordlist.size(); jj++)
{
if( wordlist[ii].substr(0,1) == "\"" )
if( wordlist[jj].substr(0,1) == "\"" )
{
imerge = 1;
}
if( wordlist[ii][ wordlist[ii].size()-1 ] == '\"' )
if( wordlist[jj][ wordlist[jj].size()-1 ] == '\"' )
{
if( imerge != 1 )
{
@@ -295,17 +293,17 @@ G4int G4tgrFileIn::GetWordsInLine( std::vector<G4String>& wordlist)
}
if( imerge == 0 )
{
wordlist2.push_back( wordlist[ii] );
wordlist2.push_back( wordlist[jj] );
}
else if( imerge == 1 )
{
if( wordq == "" )
{
wordq.append( wordlist[ii].substr(1,wordlist[ii].size()) );
wordq.append( wordlist[jj].substr(1,wordlist[jj].size()) );
}
else
{
wordq.append( wordlist[ii].substr(0,wordlist[ii].size()) );
wordq.append( wordlist[jj].substr(0,wordlist[jj].size()) );
}
wordq.append(" ");
}
@@ -313,11 +311,11 @@ G4int G4tgrFileIn::GetWordsInLine( std::vector<G4String>& wordlist)
{
if( wordq == "" )
{
wordq.append( wordlist[ii].substr(1,wordlist[ii].size()-2));
wordq.append( wordlist[jj].substr(1,wordlist[jj].size()-2));
}
else
{
wordq.append( wordlist[ii].substr(0,wordlist[ii].size()-1) );
wordq.append( wordlist[jj].substr(0,wordlist[jj].size()-1) );
}
wordlist2.push_back( wordq );
wordq = "";
source/persistency/ascii/src/G4tgrFileReader.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrFileReader.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrFileReader
source/persistency/ascii/src/G4tgrIsotope.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrIsotope.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrIsotope
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrIsotope.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgrLineProcessor.cc
+4 -8
View File
@@ -32,6 +32,8 @@
// -------------------------------------------------------------------------
#include "G4tgrLineProcessor.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrParameterMgr.hh"
#include "G4tgrFileIn.hh"
#include "G4tgrElementSimple.hh"
@@ -317,20 +319,14 @@ G4bool G4tgrLineProcessor::ProcessLine( const std::vector<G4String>& wl )
//---------------------------------------------------------------
G4tgrVolume* G4tgrLineProcessor::FindVolume( const G4String& volname )
{
G4tgrVolume* vol=0;
G4tgrVolume* vol = volmgr->FindVolume( volname, 1);
G4tgrVolume* volt = volmgr->FindVolume( volname, 1);
if( volt->GetType() == "VOLDivision" )
if( vol->GetType() == "VOLDivision" )
{
G4Exception("G4tgrLineProcessor::FindVolume()",
"InvalidSetup", FatalException,
"Using 'PLACE' for a volume created by a division !");
}
else
{
vol = (G4tgrVolume*)volt;
}
return vol;
}
source/persistency/ascii/src/G4tgrMaterial.cc
+2 -3
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrMaterial.cc,v 1.5 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrMaterial
@@ -35,7 +34,7 @@
// -------------------------------------------------------------------------
#include "G4tgrMaterial.hh"
#include "G4PhysicalConstants.hh"
// -------------------------------------------------------------------------
G4tgrMaterial::G4tgrMaterial()
source/persistency/ascii/src/G4tgrMaterialFactory.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrMaterialFactory.cc,v 1.5 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrMaterialFactory
source/persistency/ascii/src/G4tgrMaterialMixture.cc
+3 -3
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrMaterialMixture.cc,v 1.8 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrMaterialMixture
@@ -35,10 +34,11 @@
// -------------------------------------------------------------------------
#include "G4tgrMaterialMixture.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
//-----------------------------------------------------------
G4tgrMaterialMixture::G4tgrMaterialMixture()
{
source/persistency/ascii/src/G4tgrMaterialSimple.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrMaterialSimple.cc,v 1.9 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrMaterialSimple
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrMaterialSimple.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
#include "G4UIcommand.hh"
source/persistency/ascii/src/G4tgrMessenger.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrMessenger.cc,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrMessenger
source/persistency/ascii/src/G4tgrParameterMgr.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrParameterMgr.cc,v 1.7 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrParameterMgr
source/persistency/ascii/src/G4tgrPlace.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrPlace.cc,v 1.6 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrPlace
source/persistency/ascii/src/G4tgrPlaceDivRep.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrPlaceDivRep.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrPlaceDivRep
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrPlaceDivRep.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
#include "G4tgrVolume.hh"
source/persistency/ascii/src/G4tgrPlaceParameterisation.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrPlaceParameterisation.cc,v 1.8 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrPlaceParameterisation
source/persistency/ascii/src/G4tgrPlaceSimple.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrPlaceSimple.cc,v 1.7 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrPlaceSimple
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrPlaceSimple.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrVolume.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgrRotationMatrix.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrRotationMatrix.cc,v 1.7 2010-10-13 15:20:01 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrRotationMatrix
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrRotationMatrix.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrRotationMatrixFactory.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrRotationMatrixFactory.cc,v 1.3 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrRotationMatrixFactory
source/persistency/ascii/src/G4tgrSolid.cc
+8 -7
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrSolid.cc,v 1.7 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrSolid
@@ -34,14 +33,16 @@
// - Created. P.Arce, CIEMAT (November 2007)
// -------------------------------------------------------------------------
#include <map>
#include <set>
#include "G4tgrSolid.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrMessenger.hh"
#include "G4tgrVolumeMgr.hh"
#include <map>
#include <set>
// -------------------------------------------------------------------------
G4tgrSolid::G4tgrSolid()
{
@@ -146,8 +147,8 @@ void G4tgrSolid::FillSolidParams( const std::vector<G4String>& wl )
= angleParams.find(solidType);
if( ite != angleParams.end() )
{
std::set<G4int> apar = (*ite).second;
if( apar.find(ii) != apar.end() )
std::set<G4int> apar2 = (*ite).second;
if( apar2.find(ii) != apar2.end() )
{
isAngle = 1;
vd->push_back( G4tgrUtils::GetDouble( wl[3+ii], deg ));
source/persistency/ascii/src/G4tgrSolidBoolean.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrSolidBoolean.cc,v 1.5 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrSolidBoolean
source/persistency/ascii/src/G4tgrUtils.cc
+9 -8
View File
@@ -31,12 +31,13 @@
// - Created. P.Arce, CIEMAT (November 2007)
// -------------------------------------------------------------------------
#include "geomdefs.hh"
#include <iomanip>
#include <set>
#include "G4tgrUtils.hh"
#include "geomdefs.hh"
#include "G4PhysicalConstants.hh"
#include "G4tgrParameterMgr.hh"
#include "G4tgrMessenger.hh"
#include "G4UnitsTable.hh"
@@ -670,7 +671,7 @@ G4bool G4tgrUtils::AreWordsEquivalent( const G4String& word1,
const G4String& word2 )
{
G4bool bEqual = true;
std::vector< std::pair<G4int,G4int> > stringPairs;
std::vector< std::pair<size_t,size_t> > stringPairs;
// start of substring, number of characters
//--- Get string limits between asterisks in word1
@@ -697,7 +698,7 @@ G4bool G4tgrUtils::AreWordsEquivalent( const G4String& word1,
}
if( cAster!= cStart )
{
stringPairs.push_back( std::pair<G4int,G4int>(cStart, cAster-cStart) );
stringPairs.push_back( std::pair<size_t,size_t>(cStart, cAster-cStart) );
}
cStart = cAster+1;
}
@@ -717,7 +718,7 @@ G4bool G4tgrUtils::AreWordsEquivalent( const G4String& word1,
{
if( word1.length() != cStart )
{
stringPairs.push_back( std::pair<G4int,G4int>(cStart,
stringPairs.push_back( std::pair<size_t,size_t>(cStart,
word1.length()-cStart) );
}
}
@@ -739,7 +740,7 @@ G4bool G4tgrUtils::AreWordsEquivalent( const G4String& word1,
cStart = 0;
for( size_t ii = 0; ii < stringPairs.size(); ii++ )
{
std::pair<G4int,G4int> spair = stringPairs[ii];
std::pair<size_t,size_t> spair = stringPairs[ii];
size_t sFound = word2.find(word1.substr(spair.first, spair.second),cStart);
if( sFound == std::string::npos )
{
@@ -757,8 +758,8 @@ G4bool G4tgrUtils::AreWordsEquivalent( const G4String& word1,
//---- If there is no asterisk after last character,
// the last string pair found has to end at the last character
}
else if( (spair.first+spair.second-1 == G4int(word1.length()))
&& (G4int(sFound)+spair.second-1 != G4int(word2.length())) )
else if( (spair.first+spair.second-1 == word1.length())
&& (sFound+spair.second-1 != word2.length()) )
{
bEqual = false;
break;
source/persistency/ascii/src/G4tgrVolume.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrVolume.cc,v 1.13 2010-12-15 11:29:54 arce Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrVolume
source/persistency/ascii/src/G4tgrVolumeAssembly.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrVolumeAssembly.cc,v 1.7 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrVolumeAssembly
source/persistency/ascii/src/G4tgrVolumeDivision.cc
+3 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrVolumeDivision.cc,v 1.7 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrVolumeDivision
@@ -35,6 +34,8 @@
// -------------------------------------------------------------------------
#include "G4tgrVolumeDivision.hh"
#include "G4SystemOfUnits.hh"
#include "G4tgrUtils.hh"
#include "G4tgrVolumeMgr.hh"
#include "G4tgrPlace.hh"
source/persistency/ascii/src/G4tgrVolumeMgr.cc
+1 -2
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4tgrVolumeMgr.cc,v 1.10 2010-10-13 07:56:56 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// class G4tgrVolumeMgr