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

Import Geant4 9.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:25:56 +02:00
parent 74cad5e589
commit 89a9605df1
4440 changed files with 379508 additions and 189225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/cuts/src/G4PhysicsTableHelper.cc
+4 -2
View File
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PhysicsTableHelper.cc,v 1.6 2009/08/01 07:57:13 kurasige Exp $
// GEANT4 tag $Name: geant4-09-03 $
// $Id: G4PhysicsTableHelper.cc,v 1.7 2010/10/07 15:27:56 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
//
// ------------------------------------------------------------
@@ -142,6 +142,7 @@ G4bool G4PhysicsTableHelper::RetrievePhysicsTable(G4PhysicsTable* physTable,
G4cerr << "Fail to retreive from "<< fileName << G4endl;
}
#endif
delete tempTable;
return false;
}
@@ -160,6 +161,7 @@ G4bool G4PhysicsTableHelper::RetrievePhysicsTable(G4PhysicsTable* physTable,
G4cerr << G4endl;
}
#endif
delete tempTable;
return false;
}
source/processes/cuts/src/G4ProductionCutsTable.cc
+12 -8
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProductionCutsTable.cc,v 1.25 2009/11/11 03:20:22 kurasige Exp $
// GEANT4 tag $Name: geant4-09-03 $
// $Id: G4ProductionCutsTable.cc,v 1.27 2010/01/22 11:10:26 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04-beta-01 $
//
//
// --------------------------------------------------------------
@@ -251,9 +251,9 @@ void G4ProductionCutsTable::UpdateCoupleTable(G4VPhysicalVolume* currentWorld)
}
if (verboseLevel>2) {
timer.Stop();
std::cout << "G4ProductionCutsTable::UpdateCoupleTable "
G4cout << "G4ProductionCutsTable::UpdateCoupleTable "
<< " elapsed time for calculation of energy cuts " << G4endl;
std::cout << timer <<G4endl;
G4cout << timer <<G4endl;
}
// resize Range/Energy cuts double vectors if new couple is made
@@ -290,7 +290,8 @@ G4double G4ProductionCutsTable::ConvertRangeToEnergy(
if (material ==0) return -1.0;
// check range
if (range <=0.0) return -1.0;
if (range ==0.0) return 0.0;
if (range <0.0) return -1.0;
// check particle
G4int index = G4ProductionCuts::GetIndex(particle);
@@ -921,9 +922,12 @@ G4ProductionCutsTable::CheckMaterialCutsCoupleInfo(const G4String& directory,
G4ProductionCuts* aCut = aCouple->GetProductionCuts();
G4bool fRatio = true;
for (size_t j=0; j< NumberOfG4CutIndex; j++) {
G4double ratio = cutValues[j]/aCut->GetProductionCut(j);
fRatio = fRatio && (0.999<ratio) && (ratio<1.001) ;
}
// check ratio only if values are not the same
if (cutValues[j] != aCut->GetProductionCut(j)) {
G4double ratio = cutValues[j]/aCut->GetProductionCut(j);
fRatio = fRatio && (0.999<ratio) && (ratio<1.001) ;
}
}
if (!fRatio) continue;
// MCC matched
fOK = true;