Skip to content
Snippets Groups Projects
Commit e37a30b2 authored by matta's avatar matta
Browse files

* Minor change in the cout in NPS

parent 1ccf97a3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 55 additions and 39 deletions
Inputs/DetectorConfiguration/Sharc.detector
+ 2
− 2
View file @ e37a30b2
...@@ -60,12 +60,12 @@ Sharc ...@@ -60,12 +60,12 @@ Sharc
ThicknessPAD4= 1000 ThicknessPAD4= 1000
%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%Downstream CD %Downstream CD
SharcQQQ SharcQQQ
Z= 100 Z= 100
R= 0 R= 0
Phi= 0 Phi= 0
ThicknessDector= 100 ThicknessDector= 100
SharcQQQ SharcQQQ
Z= 100 Z= 100
R= 0 R= 0
Phi= 90 Phi= 90
......
Inputs/EventGenerator/24Nadp.reaction
+ 8
− 8
View file @ e37a30b2
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
Beam Beam
Particle= 24Na Particle= 24Na
Energy= 192 Energy= 192
SigmaEnergy= 1 SigmaEnergy= 1
SigmaThetaX= 0.01 SigmaThetaX= 0.01
SigmaPhiY= 0.01 SigmaPhiY= 0.01
SigmaX= 0.5 SigmaX= 0.5
SigmaY= 0.5 SigmaY= 0.5
MeanThetaX= 0 MeanThetaX= 0
MeanPhiY= 0 MeanPhiY= 0
MeanX= 0 MeanX= 0
...@@ -24,16 +24,16 @@ TwoBodyReaction ...@@ -24,16 +24,16 @@ TwoBodyReaction
Heavy= 25Na Heavy= 25Na
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 2.2 ExcitationEnergyHeavy= 2.2
CrossSectionPath= flat.txt CSR CrossSectionPath= flat.txt CSR
ShootLight= 1 ShootLight= 1
ShootHeavy= 1 ShootHeavy= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
GammaDecay 25Na %GammaDecay 25Na
Cascade Cascade
BranchingRatio= 70 BranchingRatio= 70
Energies= 2.2 Energies= 2.2
DifferentialCrossSection= 11Li(d,3He)10He.txt Gamma25Na DifferentialCrossSection= 11Li(d,3He)10He.txt Gamma25Na
Cascade Cascade
BranchingRatio= 30 BranchingRatio= 30
Energies= 1.0 1.2 Energies= 1.0 1.2
\ No newline at end of file
NPLib/IORoot/Makefile
+ 3
− 3
View file @ e37a30b2
...@@ -9,11 +9,11 @@ all: $(SHARELIB) ...@@ -9,11 +9,11 @@ all: $(SHARELIB)
## MUST2 ## ## MUST2 ##
libIORoot.so: RootInput.o RootOutput.o libIORoot.so: RootInput.o RootOutput.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@ $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
# dependances # dependances
RootInput.o: RootInput.cxx RootInput.h RootInput.o: RootInput.cxx RootInput.h
RootOutput.o: RootOutput.cxx RootOutput.h RootOutput.o: RootOutput.cxx RootOutput.h
####################################### #######################################
############# Clean and More ########## ############# Clean and More ##########
......
NPLib/IORoot/RootInput.cxx
+ 0
− 1
View file @ e37a30b2
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "RootInput.h" #include "RootInput.h"
#include "TAsciiFile.h" #include "TAsciiFile.h"
RootInput *RootInput::instance = 0; RootInput *RootInput::instance = 0;
RootInput* RootInput::getInstance(string configFileName) RootInput* RootInput::getInstance(string configFileName)
......
NPLib/IORoot/RootInput.h
+ 1
− 0
View file @ e37a30b2
...@@ -78,6 +78,7 @@ private: ...@@ -78,6 +78,7 @@ private:
TChain *pRootChain; TChain *pRootChain;
TFile *pRootFile; TFile *pRootFile;
int NumberOfFriend; int NumberOfFriend;
}; };
// A convenient function related to Root Input, coded Here so it can be called within ROOT CINT // A convenient function related to Root Input, coded Here so it can be called within ROOT CINT
......
NPLib/IORoot/RootOutput.h
+ 1
− 0
View file @ e37a30b2
...@@ -87,6 +87,7 @@ private: ...@@ -87,6 +87,7 @@ private:
TAsciiFile *pCalibrationFile; TAsciiFile *pCalibrationFile;
TAsciiFile *pRunToTreatFile; TAsciiFile *pRunToTreatFile;
TAsciiFile *pAnalysisConfigFile; TAsciiFile *pAnalysisConfigFile;
}; };
#endif // ROOTOUTPUT_HH #endif // ROOTOUTPUT_HH
NPLib/Physics/Makefile
+ 7
− 3
View file @ e37a30b2
...@@ -8,11 +8,15 @@ all: $(SHARELIB) ...@@ -8,11 +8,15 @@ all: $(SHARELIB)
############# Various Tool ############ ############# Various Tool ############
## Reaction ## ## Reaction ##
libNPPhysics.so: NPReaction.o NPNucleus.o NPBeam.o NPEnergyLoss.o NPFunction.o libNPPhysics.so: NPReaction.o NPNucleus.o NPBeam.o NPEnergyLoss.o NPFunction.o NPReactionDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@ $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
NPReactionDict.cxx: NPReaction.h
rootcint -f $@ -c $^ linkdef.h
# dependances # dependances
NPReaction.o:NPReaction.cxx NPReaction.h NPReaction.o:NPReaction.cxx NPReaction.h
NPReactionDict.o:NPReaction.cxx NPReaction.h linkdef.h
NPNucleus.o: NPNucleus.cxx NPNucleus.h NPNucleus.o: NPNucleus.cxx NPNucleus.h
NPEnergyLoss.o:NPEnergyLoss.cxx NPEnergyLoss.h NPEnergyLoss.o:NPEnergyLoss.cxx NPEnergyLoss.h
NPBeam.o: NPBeam.cxx NPBeam.h NPBeam.o: NPBeam.cxx NPBeam.h
......
NPLib/Physics/NPReaction.cxx
+ 1
− 0
View file @ e37a30b2
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
// Use CLHEP System of unit and Physical Constant // Use CLHEP System of unit and Physical Constant
#include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/GlobalSystemOfUnits.h"
#include "CLHEP/Units/PhysicalConstants.h" #include "CLHEP/Units/PhysicalConstants.h"
ClassImp(Reaction)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Reaction::Reaction(){ Reaction::Reaction(){
......
NPLib/Physics/NPReaction.h
+ 3
− 0
View file @ e37a30b2
...@@ -187,6 +187,9 @@ namespace NPL{ ...@@ -187,6 +187,9 @@ namespace NPL{
// Print private paremeter // Print private paremeter
void Print() const; void Print() const;
ClassDef(Reaction,0)
}; };
} }
#endif #endif
NPLib/Physics/linkdef.h 0 → 100644
+ 5
− 0
View file @ e37a30b2
#ifdef __CINT__
#pragma link C++ defined_in "./NPReaction.h";
#pragma link C++ defined_in "./NPBeam.h";
#pragma link C++ defined_in "./NPNucleus.h";
#endif
\ No newline at end of file
NPSimulation/src/DetectorConstruction.cc
+ 17
− 17
View file @ e37a30b2
...@@ -217,7 +217,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -217,7 +217,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
//////////////////////////////////////////// ////////////////////////////////////////////
else if (LineBuffer.compare(0, 16, "TheDUMMYDetector") == 0 && cDummy == false) { else if (LineBuffer.compare(0, 16, "TheDUMMYDetector") == 0 && cDummy == false) {
cDummy = true ; cDummy = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// DUMMY DETECTOR ////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "//////// DUMMY DETECTOR ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new DUMMYDetector() ; VDetector* myDetector = new DUMMYDetector() ;
...@@ -238,7 +238,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -238,7 +238,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 16, "ComptonTelescope") == 0 && cComptonTelescope == false) { else if (LineBuffer.compare(0, 16, "ComptonTelescope") == 0 && cComptonTelescope == false) {
#ifdef INC_COMPTONTELESCOPE #ifdef INC_COMPTONTELESCOPE
cComptonTelescope = true; cComptonTelescope = true;
if(VerboseLevel==1) G4cout << "//////// ComptonTelescope ////////" << G4endl; if(VerboseLevel==1) cout << "//////// ComptonTelescope ////////" << endl;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new ComptonTelescope(); VDetector* myDetector = new ComptonTelescope();
...@@ -260,7 +260,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -260,7 +260,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 7, "Eurogam") == 0 && cEurogam == false) { else if (LineBuffer.compare(0, 7, "Eurogam") == 0 && cEurogam == false) {
#ifdef INC_EUROGAM #ifdef INC_EUROGAM
cEurogam = true; cEurogam = true;
if(VerboseLevel==1) G4cout << "//////// Eurogam ////////" << G4endl; if(VerboseLevel==1) cout << "//////// Eurogam ////////" << endl;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new Eurogam(); VDetector* myDetector = new Eurogam();
...@@ -282,7 +282,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -282,7 +282,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 14, "GaspardTracker") == 0 && cGPDTracker == false) { else if (LineBuffer.compare(0, 14, "GaspardTracker") == 0 && cGPDTracker == false) {
#ifdef INC_GASPARD #ifdef INC_GASPARD
cGPDTracker = true ; cGPDTracker = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// Gaspard Tracker ////////" << G4endl ; if(VerboseLevel==1) cout << endl << "//////// Gaspard Tracker ////////" << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new GaspardTracker() ; VDetector* myDetector = new GaspardTracker() ;
...@@ -304,7 +304,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -304,7 +304,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 11, "HydeTracker") == 0 && cHYDTracker == false) { else if (LineBuffer.compare(0, 11, "HydeTracker") == 0 && cHYDTracker == false) {
#ifdef INC_HYDE #ifdef INC_HYDE
cHYDTracker = true ; cHYDTracker = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// Hyde Tracker ////////" << G4endl ; if(VerboseLevel==1) cout << endl << "//////// Hyde Tracker ////////" << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new HydeTracker() ; VDetector* myDetector = new HydeTracker() ;
...@@ -326,7 +326,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -326,7 +326,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 5, "Paris") == 0 && cParis == false) { else if (LineBuffer.compare(0, 5, "Paris") == 0 && cParis == false) {
#ifdef INC_PARIS #ifdef INC_PARIS
cParis = true ; cParis = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// Paris ////////" << G4endl ; if(VerboseLevel==1) cout << endl << "//////// Paris ////////" << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new Paris() ; VDetector* myDetector = new Paris() ;
...@@ -347,7 +347,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -347,7 +347,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 6, "Shield") == 0 && cShield == false) { else if (LineBuffer.compare(0, 6, "Shield") == 0 && cShield == false) {
#ifdef INC_SHIELD #ifdef INC_SHIELD
cShield = true ; cShield = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// Shield ////////" << G4endl ; if(VerboseLevel==1) cout << endl << "//////// Shield ////////" << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new Shield() ; VDetector* myDetector = new Shield() ;
...@@ -368,7 +368,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -368,7 +368,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 9, "AnnularS1") == 0 && cS1 == false) { else if (LineBuffer.compare(0, 9, "AnnularS1") == 0 && cS1 == false) {
#ifdef INC_ANNULARSi1 #ifdef INC_ANNULARSi1
cS1 = true ; cS1 = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// S1 Annular detector ////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "//////// S1 Annular detector ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new AnnularS1() ; VDetector* myDetector = new AnnularS1() ;
...@@ -389,7 +389,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -389,7 +389,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 2, "W1") == 0 && cW1 == false) { else if (LineBuffer.compare(0, 2, "W1") == 0 && cW1 == false) {
#ifdef INC_W1 #ifdef INC_W1
cW1 = true ; cW1 = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// W1 Square detector ////////" << G4endl << G4endl; if(VerboseLevel==1) cout << endl << "//////// W1 Square detector ////////" << endl << endl;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new W1(); VDetector* myDetector = new W1();
...@@ -410,7 +410,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -410,7 +410,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 10, "MUST2Array") == 0 && cMUST2 == false) { else if (LineBuffer.compare(0, 10, "MUST2Array") == 0 && cMUST2 == false) {
#ifdef INC_MUST2 #ifdef INC_MUST2
cMUST2 = true ; cMUST2 = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// MUST2 Array ////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "//////// MUST2 Array ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new MUST2Array() ; VDetector* myDetector = new MUST2Array() ;
...@@ -431,7 +431,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -431,7 +431,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 9, "SSSDArray") == 0 && cAddThinSi == false) { else if (LineBuffer.compare(0, 9, "SSSDArray") == 0 && cAddThinSi == false) {
#ifdef INC_SSSD #ifdef INC_SSSD
cAddThinSi = true ; cAddThinSi = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// SSSD ////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "//////// SSSD ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new ThinSi() ; VDetector* myDetector = new ThinSi() ;
...@@ -452,7 +452,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -452,7 +452,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 5, "Sharc") == 0 && cSharc == false) { else if (LineBuffer.compare(0, 5, "Sharc") == 0 && cSharc == false) {
#ifdef INC_SHARC #ifdef INC_SHARC
cSharc = true ; cSharc = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// Sharc ////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "//////// Sharc ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new Sharc(); VDetector* myDetector = new Sharc();
...@@ -473,7 +473,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -473,7 +473,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 19, "ScintillatorPlastic") == 0 && cPlastic == false) { else if (LineBuffer.compare(0, 19, "ScintillatorPlastic") == 0 && cPlastic == false) {
#ifdef INC_PLASTIC #ifdef INC_PLASTIC
cPlastic = true ; cPlastic = true ;
if(VerboseLevel==1) G4cout << G4endl << "//////// Plastic ////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "//////// Plastic ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
VDetector* myDetector = new Plastic() ; VDetector* myDetector = new Plastic() ;
...@@ -493,14 +493,14 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -493,14 +493,14 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 6, "Helios") == 0 && cHelios == false) { else if (LineBuffer.compare(0, 6, "Helios") == 0 && cHelios == false) {
#ifdef INC_HELIOS #ifdef INC_HELIOS
cHelios = true ; cHelios = true ;
G4cout << "//////// Helios detector ////////" << G4endl ; cout << "//////// Helios detector ////////" << endl ;
ConfigFile >> DataBuffer ; ConfigFile >> DataBuffer ;
if (DataBuffer.compare(0, 7, "MField=") == 0){ if (DataBuffer.compare(0, 7, "MField=") == 0){
check_MField = true; check_MField = true;
ConfigFile >> DataBuffer ; ConfigFile >> DataBuffer ;
Bz = atof(DataBuffer.c_str()) ; Bz = atof(DataBuffer.c_str()) ;
G4cout << "//////// Magentic Field set at Bz= " << Bz << " ////////" << G4endl ; cout << "//////// Magentic Field set at Bz= " << Bz << " ////////" << endl ;
} }
// Instantiate the new array as a VDetector Object // Instantiate the new array as a VDetector Object
...@@ -608,7 +608,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -608,7 +608,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 13, "GeneralTarget") == 0 && cGeneralTarget == false) { else if (LineBuffer.compare(0, 13, "GeneralTarget") == 0 && cGeneralTarget == false) {
cGeneralTarget = true ; cGeneralTarget = true ;
if(VerboseLevel==1) G4cout << G4endl << "////////// Target ///////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "////////// Target ///////////" << endl << endl ;
// Instantiate the new array as a VDetector Objects // Instantiate the new array as a VDetector Objects
VDetector* myDetector = new Target(); VDetector* myDetector = new Target();
...@@ -631,7 +631,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ ...@@ -631,7 +631,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
else if (LineBuffer.compare(0, 14, "GeneralChamber") == 0 && cGeneralChamber == false) { else if (LineBuffer.compare(0, 14, "GeneralChamber") == 0 && cGeneralChamber == false) {
cGeneralChamber = true ; cGeneralChamber = true ;
if(VerboseLevel==1) G4cout << G4endl << "////////// Chamber ///////////" << G4endl << G4endl ; if(VerboseLevel==1) cout << endl << "////////// Chamber ///////////" << endl << endl ;
// Instantiate the new array as a VDetector Objects // Instantiate the new array as a VDetector Objects
VDetector* myDetector = new Chamber(); VDetector* myDetector = new Chamber();
......
NPSimulation/src/PrimaryGeneratorAction.cc
+ 7
− 5
View file @ e37a30b2
...@@ -29,14 +29,15 @@ ...@@ -29,14 +29,15 @@
#include "G4ParticleDefinition.hh" #include "G4ParticleDefinition.hh"
// NPL // NPL
#include "PrimaryGeneratorAction.hh" #include "NPOptionManager.h"
#include "PhysicsList.hh"
#include "Randomize.hh"
#include "ParticleStack.hh"
// CLHEP // CLHEP
#include "CLHEP/Random/RandGauss.h" #include "CLHEP/Random/RandGauss.h"
#include "CLHEP/Random/RandGeneral.h" #include "CLHEP/Random/RandGeneral.h"
#include "PrimaryGeneratorAction.hh"
#include "PhysicsList.hh"
#include "Randomize.hh"
#include "ParticleStack.hh"
// Event Generator Class // Event Generator Class
#include "EventGeneratorTwoBodyReaction.hh" #include "EventGeneratorTwoBodyReaction.hh"
...@@ -80,6 +81,8 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path){ ...@@ -80,6 +81,8 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path){
int alreadyiInstantiate_ParticleDecay = 0; int alreadyiInstantiate_ParticleDecay = 0;
int seenToken_ParticleDecay = 0; int seenToken_ParticleDecay = 0;
if(NPOptionManager::getInstance()->GetVerboseLevel()==1) cout << "/////////////////////////////////////////////////// " << endl ;
string LineBuffer; string LineBuffer;
ifstream EventGeneratorFile; ifstream EventGeneratorFile;
EventGeneratorFile.open(Path.c_str()); EventGeneratorFile.open(Path.c_str());
...@@ -100,7 +103,6 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path){ ...@@ -100,7 +103,6 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path){
; ;
} }
//Search for Isotropic source //Search for Isotropic source
else if (LineBuffer.compare(0, 9, "Isotropic") == 0 && !check_Isotropic) { else if (LineBuffer.compare(0, 9, "Isotropic") == 0 && !check_Isotropic) {
check_Isotropic = true; check_Isotropic = true;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment