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

Import Geant4 10.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 12:08:39 +02:00
parent 286caacf06
commit c9b32a6c0a
5770 changed files with 1050949 additions and 367105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/cuts/src/G4ProductionCutsTable.cc
+20 -17
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ProductionCutsTable.cc 71792 2013-06-24 14:11:27Z gcosmo $
// $Id: G4ProductionCutsTable.cc 78776 2014-01-23 11:26:01Z gcosmo $
//
//
// --------------------------------------------------------------
@@ -971,10 +971,10 @@ G4ProductionCutsTable::CheckMaterialCutsCoupleInfo(const G4String& directory,
break;
}
if (fOK) {
#ifdef G4VERBOSE
// debug information
if (verboseLevel >1) {
if (fOK) {
// debug information
if (verboseLevel >1) {
G4String regionname(region_name);
G4Region* fRegion = 0;
if ( regionname != "NONE" ) {
@@ -1009,20 +1009,23 @@ G4ProductionCutsTable::CheckMaterialCutsCoupleInfo(const G4String& directory,
G4cout << " is consistent with current setup" << G4endl;
}
}
}
if ((!fOK) && (verboseLevel >0)) {
G4cout << "G4ProductionCutTable::CheckMaterialCutsCoupleInfo ";
G4cout << "Couples is not defined in the current detector setup ";
G4cout << index << ": in " << fileName << G4endl;
G4cout << " material: " << mat_name ;
G4cout << " region: " << region_name << G4endl;
for (size_t ii=0; ii< NumberOfG4CutIndex; ii++) {
G4cout << "cut[" << ii << "]=" << cutValues[ii]/mm;
G4cout << " mm : ";
}
G4cout << G4endl;
}
#endif
} else {
#ifdef G4VERBOSE
if (verboseLevel >0) {
G4cout << "G4ProductionCutTable::CheckMaterialCutsCoupleInfo ";
G4cout << "Couples is not defined in the current detector setup ";
G4cout << index << ": in " << fileName << G4endl;
G4cout << " material: " << mat_name ;
G4cout << " region: " << region_name << G4endl;
for (size_t ii=0; ii< NumberOfG4CutIndex; ii++) {
G4cout << "cut[" << ii << "]=" << cutValues[ii]/mm;
G4cout << " mm : ";
}
G4cout << G4endl;
}
#endif
}
}
fIn.close();
source/processes/cuts/src/G4VRangeToEnergyConverter.cc
+19 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRangeToEnergyConverter.cc 77079 2013-11-21 10:32:34Z gcosmo $
// $Id: G4VRangeToEnergyConverter.cc 81295 2014-05-26 09:36:06Z gcosmo $
//
//
// --------------------------------------------------------------
@@ -72,9 +72,6 @@ G4VRangeToEnergyConverter & G4VRangeToEnergyConverter::operator=(const G4VRangeT
theLossTable=0;
}
LowestEnergy = right.LowestEnergy;
HighestEnergy = right.HighestEnergy;
MaxEnergyCut = right.MaxEnergyCut;
fMaxEnergyCut = right.fMaxEnergyCut;
NumberOfElements = right.NumberOfElements;
theParticle = right.theParticle;
@@ -119,7 +116,19 @@ G4VRangeToEnergyConverter & G4VRangeToEnergyConverter::operator=(const G4VRangeT
G4VRangeToEnergyConverter::~G4VRangeToEnergyConverter()
{
// Reset();
// Reset();
// Comment out Reset() for MT application
// delete loss table without deleteing vectors
if (theLossTable) {
delete theLossTable;
}
theLossTable=0;
NumberOfElements=0;
//clear RangeVectorStore without deleteing vectors
fRangeVectorStore.clear();
}
G4int G4VRangeToEnergyConverter::operator==(const G4VRangeToEnergyConverter &right) const
@@ -341,8 +350,11 @@ void G4VRangeToEnergyConverter::BuildRangeVector(const G4Material* aMaterial,
}
// Integrate with Simpson formula with logarithmic binning
G4double ltt = std::log(MaxEnergyCut/LowestEnergy);
G4double dltau = ltt/TotBin;
G4double dltau = 1.0;
if (LowestEnergy>0.) {
G4double ltt =std::log(MaxEnergyCut/LowestEnergy);
dltau = ltt/TotBin;
}
G4double s0 = 0.;
G4double Value;