Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nptool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
np
nptool
Commits
d8fad4a2
Commit
d8fad4a2
authored
14 years ago
by
matta
Browse files
Options
Downloads
Patches
Plain Diff
* Same change in NPSimulation
- Test Performed everything is Ok!
parent
30cdbbe6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NPSimulation/src/DetectorConstruction.cc
+15
-7
15 additions, 7 deletions
NPSimulation/src/DetectorConstruction.cc
NPSimulation/src/PrimaryGeneratorAction.cc
+18
-7
18 additions, 7 deletions
NPSimulation/src/PrimaryGeneratorAction.cc
with
33 additions
and
14 deletions
NPSimulation/src/DetectorConstruction.cc
+
15
−
7
View file @
d8fad4a2
...
...
@@ -170,17 +170,25 @@ void DetectorConstruction::ReadConfigurationFile(string Path)
//////////////////////////////////////////////////////////////////////////////////////////
// added by Nicolas [07/05/09]
string
GlobalPath
=
getenv
(
"NPTOOL"
);
Path
=
GlobalPath
+
"/Inputs/DetectorConfiguration/"
+
Path
;
string
Standard
Path
=
GlobalPath
+
"/Inputs/DetectorConfiguration/"
+
Path
;
ifstream
ConfigFile
;
ConfigFile
.
open
(
Path
.
c_str
());
ConfigFile
.
open
(
Standard
Path
.
c_str
());
if
(
ConfigFile
.
is_open
())
cout
<<
" Configuration file "
<<
Path
<<
" loading "
<<
endl
;
else
{
cout
<<
" Error, no configuration file"
<<
Path
<<
" found"
<<
endl
;
return
;
}
{
cout
<<
" Configuration file "
<<
Path
<<
" loading "
<<
endl
;
Path
=
StandardPath
;
}
else
{
ConfigFile
.
open
(
Path
.
c_str
()
);
if
(
ConfigFile
.
is_open
())
{
cout
<<
" Configuration file "
<<
Path
<<
" loading "
<<
endl
;
}
else
{
cout
<<
" Error, no configuration file"
<<
Path
<<
" found"
<<
endl
;
return
;}
}
while
(
!
ConfigFile
.
eof
())
{
//Pick-up next line
...
...
This diff is collapsed.
Click to expand it.
NPSimulation/src/PrimaryGeneratorAction.cc
+
18
−
7
View file @
d8fad4a2
...
...
@@ -79,10 +79,10 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path)
{
// added by Nicolas [07/05/09]
string
GlobalPath
=
getenv
(
"NPTOOL"
);
Path
=
GlobalPath
+
"/Inputs/EventGenerator/"
+
Path
;
string
Standard
Path
=
GlobalPath
+
"/Inputs/EventGenerator/"
+
Path
;
string
LineBuffer
;
ifstream
EventGeneratorFile
;
EventGeneratorFile
.
open
(
Path
.
c_str
());
EventGeneratorFile
.
open
(
Standard
Path
.
c_str
());
bool
check_TransfertToResonance
=
false
;
bool
check_PhaseSpace
=
false
;
...
...
@@ -90,11 +90,22 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path)
bool
check_Transfert
=
false
;
bool
check_Beam
=
false
;
if
(
EventGeneratorFile
.
is_open
())
cout
<<
" Event Generator file "
<<
Path
<<
" loading "
<<
endl
;
else
{
cout
<<
" Error, Event Generator file "
<<
Path
<<
" found"
<<
endl
;
return
;
}
if
(
EventGeneratorFile
.
is_open
())
{
cout
<<
" Event Generator file "
<<
Path
<<
" loading "
<<
endl
;
Path
=
StandardPath
;
}
else
{
EventGeneratorFile
.
open
(
Path
.
c_str
()
);
if
(
EventGeneratorFile
.
is_open
())
{
cout
<<
" Event Generator file "
<<
Path
<<
" loading "
<<
endl
;
}
else
{
cout
<<
" Error, Event Generator file "
<<
Path
<<
" found"
<<
endl
;
return
;}
}
while
(
!
EventGeneratorFile
.
eof
())
{
//Pick-up next line
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment