diff --git a/NPLib/Physics/NPNucleus.cxx b/NPLib/Physics/NPNucleus.cxx
index 89c5a90311ef9aa20b3dcbb1b12a1456d0e24d12..fe4da01a5bd47d51f35c405d8f61f95d58643f8f 100644
--- a/NPLib/Physics/NPNucleus.cxx
+++ b/NPLib/Physics/NPNucleus.cxx
@@ -50,14 +50,14 @@ using namespace std;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Nucleus::Nucleus()
{
- //----------- Default Constructor ----------
- fName= "XX DEFAULT XX";
- fCharge= 0;
- fAtomicWeight= 0;
- fMassExcess= 0;
- fSpinParity= "";
- fSpin= 0;
- fParity= "";
+ //----------- Default Constructor ----------
+ fName= "XX DEFAULT XX";
+ fCharge= 0;
+ fAtomicWeight= 0;
+ fMassExcess= 0;
+ fSpinParity= "";
+ fSpin= 0;
+ fParity= "";
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -68,70 +68,78 @@ Nucleus::Nucleus(string isotope){
void Nucleus::SetUp(string isotope){
//----------- Constructor Using nubtab03.asc by name----------
// open the file to read and check if it is open
-
+
// Replace the p,d,t,a by there standard name:
- if(isotope=="p") isotope="1H";
+ if(isotope=="p") isotope="1H";
else if(isotope=="d") isotope="2H";
else if(isotope=="t") isotope="3H";
else if(isotope=="a") isotope="4He";
-
+
const char* Isotope = isotope.c_str();
-
+
ifstream inFile;
string Path = getenv("NPTOOL") ;
string FileName = Path + "/NPLib/Physics/nubtab03.asc";
inFile.open(FileName.c_str());
-
+
// reading the file
string line, s_name;
size_t space;
if (inFile.is_open()) {
while (!inFile.eof()) {
getline(inFile,line);
-
+
s_name = line.substr(11,7);
space = s_name.find_first_of(" ");
s_name.resize(space);
-
+
if (s_name.find(Isotope) != string::npos && s_name.length() == isotope.length()) break;
}
Extract(line.data());
}
else cout << "Unable to open file nuclear data base file " << FileName << endl;
-
-
+
+
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Nucleus::Nucleus(int Z, int A)
{
- //----------- Constructor Using nubtab03.asc by Z and A----------
-
- // open the file to read and check if it is open
- ifstream inFile;
- string Path = getenv("NPTOOL") ;
- string FileName = Path + "/NPLib/Physics/nubtab03.asc";
- inFile.open(FileName.c_str());
-
- // reading the file
- string line, s_charge, s_mass;
- int charge, mass;
- // read the data
- if (inFile.is_open()) {
- while (!inFile.eof()) {
- getline(inFile,line);
- s_mass = line.substr(0,3);
- s_charge = line.substr(4,4);
- charge = atoi(s_charge.data());
- mass = atoi(s_mass.data());
- if (mass == A && charge == Z*10) break;
+ //----------- Constructor Using nubtab03.asc by Z and A----------
+
+ // open the file to read and check if it is open
+ ifstream inFile;
+ string Path = getenv("NPTOOL") ;
+ string FileName = Path + "/NPLib/Physics/nubtab03.asc";
+ inFile.open(FileName.c_str());
+
+ // reading the file
+ string line, s_charge, s_mass;
+ int charge, mass;
+ bool check = false;
+ // read the data
+ if (inFile.is_open()) {
+ while (!inFile.eof()) {
+ getline(inFile,line);
+ if(inFile.eof())
+ break;
+ s_mass = line.substr(0,3);
+ s_charge = line.substr(4,4);
+ charge = atoi(s_charge.data());
+ mass = atoi(s_mass.data());
+ if (mass == A && charge == Z*10){
+ check = true;
+ break;
}
+ }
+ if(check)
Extract(line.data());
- }
- else cout << "Unable to open file nuclear data base file " << FileName << endl;
-
- // close the file
- inFile.close();
+ }
+ else
+ cout << "Unable to open file nuclear data base file " << FileName << endl;
+
+ // close the file
+ inFile.close();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -142,136 +150,136 @@ Nucleus::~Nucleus()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::Extract(const char* line)
{
- string ligne = line;
-
- // name of the isotope
- string s_name = ligne.substr(11,7);
- fName = s_name.data();
-
- // charge and mass
- string s_mass = ligne.substr(0,3);
- string s_charge = ligne.substr(4,4);
- fAtomicWeight = atoi(s_mass.data());
- fCharge = atoi(s_charge.data()); fCharge /= 10;
-
- // mass excess
- string s_excess = ligne.substr(18,10);
- fMassExcess = atof(s_excess.data());
-
- // spin and parity
- string s_spinparity = ligne.substr(79,14);
- fSpinParity = s_spinparity.data();
- size_t found_p = s_spinparity.find("+");
- size_t found_m = s_spinparity.find("-");
-// size_t found_( = s_jpi.find("(");
-// size_t found_) = s_jpi.find(")");
-// size_t found_# = s_jpi.find("#");
- // parity
- if (found_p != string::npos) fParity = "+";
- if (found_m != string::npos) fParity = "-";
- // spin
- if (s_spinparity.find("0") != string::npos) fSpin = 0 ;
- if (s_spinparity.find("1") != string::npos) fSpin = 1 ;
- if (s_spinparity.find("2") != string::npos) fSpin = 2 ;
- if (s_spinparity.find("3") != string::npos) fSpin = 3 ;
- if (s_spinparity.find("4") != string::npos) fSpin = 4 ;
- if (s_spinparity.find("5") != string::npos) fSpin = 5 ;
- if (s_spinparity.find("6") != string::npos) fSpin = 6 ;
- if (s_spinparity.find("7") != string::npos) fSpin = 7 ;
- if (s_spinparity.find("8") != string::npos) fSpin = 8 ;
- if (s_spinparity.find("9") != string::npos) fSpin = 9 ;
- if (s_spinparity.find("10") != string::npos) fSpin = 10 ;
- if (s_spinparity.find("1/2") != string::npos) fSpin = 0.5 ;
- if (s_spinparity.find("3/2") != string::npos) fSpin = 1.5 ;
- if (s_spinparity.find("5/2") != string::npos) fSpin = 2.5 ;
- if (s_spinparity.find("7/2") != string::npos) fSpin = 3.5 ;
- if (s_spinparity.find("9/2") != string::npos) fSpin = 4.5 ;
- if (s_spinparity.find("11/2") != string::npos) fSpin = 5.5 ;
- if (s_spinparity.find("13/2") != string::npos) fSpin = 6.5 ;
- if (s_spinparity.find("15/2") != string::npos) fSpin = 7.5 ;
- if (s_spinparity.find("17/2") != string::npos) fSpin = 8.5 ;
- if (s_spinparity.find("19/2") != string::npos) fSpin = 9.5 ;
- if (s_spinparity.find("21/2") != string::npos) fSpin = 10.5 ;
- //cout << fName << endl;
- GetNucleusName();
-
+ string ligne = line;
+
+ // name of the isotope
+ string s_name = ligne.substr(11,7);
+ fName = s_name.data();
+
+ // charge and mass
+ string s_mass = ligne.substr(0,3);
+ string s_charge = ligne.substr(4,4);
+ fAtomicWeight = atoi(s_mass.data());
+ fCharge = atoi(s_charge.data()); fCharge /= 10;
+
+ // mass excess
+ string s_excess = ligne.substr(18,10);
+ fMassExcess = atof(s_excess.data());
+
+ // spin and parity
+ string s_spinparity = ligne.substr(79,14);
+ fSpinParity = s_spinparity.data();
+ size_t found_p = s_spinparity.find("+");
+ size_t found_m = s_spinparity.find("-");
+ // size_t found_( = s_jpi.find("(");
+ // size_t found_) = s_jpi.find(")");
+ // size_t found_# = s_jpi.find("#");
+ // parity
+ if (found_p != string::npos) fParity = "+";
+ if (found_m != string::npos) fParity = "-";
+ // spin
+ if (s_spinparity.find("0") != string::npos) fSpin = 0 ;
+ if (s_spinparity.find("1") != string::npos) fSpin = 1 ;
+ if (s_spinparity.find("2") != string::npos) fSpin = 2 ;
+ if (s_spinparity.find("3") != string::npos) fSpin = 3 ;
+ if (s_spinparity.find("4") != string::npos) fSpin = 4 ;
+ if (s_spinparity.find("5") != string::npos) fSpin = 5 ;
+ if (s_spinparity.find("6") != string::npos) fSpin = 6 ;
+ if (s_spinparity.find("7") != string::npos) fSpin = 7 ;
+ if (s_spinparity.find("8") != string::npos) fSpin = 8 ;
+ if (s_spinparity.find("9") != string::npos) fSpin = 9 ;
+ if (s_spinparity.find("10") != string::npos) fSpin = 10 ;
+ if (s_spinparity.find("1/2") != string::npos) fSpin = 0.5 ;
+ if (s_spinparity.find("3/2") != string::npos) fSpin = 1.5 ;
+ if (s_spinparity.find("5/2") != string::npos) fSpin = 2.5 ;
+ if (s_spinparity.find("7/2") != string::npos) fSpin = 3.5 ;
+ if (s_spinparity.find("9/2") != string::npos) fSpin = 4.5 ;
+ if (s_spinparity.find("11/2") != string::npos) fSpin = 5.5 ;
+ if (s_spinparity.find("13/2") != string::npos) fSpin = 6.5 ;
+ if (s_spinparity.find("15/2") != string::npos) fSpin = 7.5 ;
+ if (s_spinparity.find("17/2") != string::npos) fSpin = 8.5 ;
+ if (s_spinparity.find("19/2") != string::npos) fSpin = 9.5 ;
+ if (s_spinparity.find("21/2") != string::npos) fSpin = 10.5 ;
+ //cout << fName << endl;
+ GetNucleusName();
+
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::Print() const
{
- //------------ Imprime a l'ecran les caracteristiques d'un noyau -------
- cout << endl;
- cout << "Isotope: " << fName << endl;
- cout << "Z = " << fCharge << " A = " << fAtomicWeight << endl;
- cout << "Mass Excess: " << fMassExcess << " keV" << endl;
- cout << "Jpi = " << fSpinParity << " (" << fSpin << fParity << ")" << endl;
+ //------------ Imprime a l'ecran les caracteristiques d'un noyau -------
+ cout << endl;
+ cout << "Isotope: " << fName << endl;
+ cout << "Z = " << fCharge << " A = " << fAtomicWeight << endl;
+ cout << "Mass Excess: " << fMassExcess << " keV" << endl;
+ cout << "Jpi = " << fSpinParity << " (" << fSpin << fParity << ")" << endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::GetNucleusName()
{
-fNucleusName=string(fName,6);
+ fNucleusName=string(fName,6);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::EnergyToBrho()
{
- fBrho = sqrt(pow(fKineticEnergy,2) + 2*fKineticEnergy*Mass()) * 1e6 * e_SI / (c_light*1e6) / (GetZ() * e_SI);
+ fBrho = sqrt(pow(fKineticEnergy,2) + 2*fKineticEnergy*Mass()) * 1e6 * e_SI / (c_light*1e6) / (GetZ() * e_SI);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::EnergyToTof() // second/meter
{
- fTimeOfFlight = 1/sqrt(1-(Mass()*Mass())/(fKineticEnergy+Mass())/(fKineticEnergy+Mass()))/(c_light*1e6);
+ fTimeOfFlight = 1/sqrt(1-(Mass()*Mass())/(fKineticEnergy+Mass())/(fKineticEnergy+Mass()))/(c_light*1e6);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::TofToEnergy()
{
- double Energy = sqrt( Mass()*Mass()/(1-pow((1/((c_light*1e6)*fTimeOfFlight)),2)) );
- fKineticEnergy = Energy - Mass();
+ double Energy = sqrt( Mass()*Mass()/(1-pow((1/((c_light*1e6)*fTimeOfFlight)),2)) );
+ fKineticEnergy = Energy - Mass();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::BrhoToEnergy()
{
- fKineticEnergy = sqrt( pow((fBrho*(c_light*1e6)*GetZ()*e_SI)/(1e6*e_SI),2) + pow(Mass(),2) ) - Mass();
+ fKineticEnergy = sqrt( pow((fBrho*(c_light*1e6)*GetZ()*e_SI)/(1e6*e_SI),2) + pow(Mass(),2) ) - Mass();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::EnergyToBeta()
{
- fBeta = sqrt(pow(fKineticEnergy,2) + 2*fKineticEnergy*Mass())/(fKineticEnergy + Mass());
+ fBeta = sqrt(pow(fKineticEnergy,2) + 2*fKineticEnergy*Mass())/(fKineticEnergy + Mass());
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::BetaToEnergy()
{
- fKineticEnergy = Mass()/sqrt(1-pow(fBeta,2)) - Mass();
+ fKineticEnergy = Mass()/sqrt(1-pow(fBeta,2)) - Mass();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::BetaToGamma()
{
- fGamma = 1/sqrt(1-pow(fBeta,2));
+ fGamma = 1/sqrt(1-pow(fBeta,2));
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Nucleus::BetaToVelocity() // in cm/ns
{
- fVelocity = (c_light*1e6)*fBeta*1e-7;
+ fVelocity = (c_light*1e6)*fBeta*1e-7;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
double Nucleus::DopplerCorrection(double EnergyLabGamma, double ThetaLabGamma)
{
- double EnergyGammaCorrected = EnergyLabGamma*(1-fBeta*cos(ThetaLabGamma))/( sqrt(1-pow(fBeta,2)) );
-
- return EnergyGammaCorrected;
+ double EnergyGammaCorrected = EnergyLabGamma*(1-fBeta*cos(ThetaLabGamma))/( sqrt(1-pow(fBeta,2)) );
+
+ return EnergyGammaCorrected;
}