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
Admin message
Gitlab has been updated. More info
here
.
Show more breadcrumbs
np
nptool
Commits
09adec75
Commit
09adec75
authored
10 years ago
by
adrien-matta
Browse files
Options
Downloads
Patches
Plain Diff
* Adding annular S1 to the detector manager
parent
2fa96209
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
NPLib/VDetector/DetectorManager.cxx
+48
-25
48 additions, 25 deletions
NPLib/VDetector/DetectorManager.cxx
with
48 additions
and
25 deletions
NPLib/VDetector/DetectorManager.cxx
+
48
−
25
View file @
09adec75
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
// Detector
// Detector
#include
"../DetectorList.inc"
#include
"../DetectorList.inc"
#include
"TAnnularS1Physics.h"
#include
"TExogamPhysics.h"
#include
"TExogamPhysics.h"
#include
"TMust2Physics.h"
#include
"TMust2Physics.h"
#include
"TCATSPhysics.h"
#include
"TCATSPhysics.h"
...
@@ -80,31 +81,32 @@ void DetectorManager::ReadConfigurationFile(string Path) {
...
@@ -80,31 +81,32 @@ void DetectorManager::ReadConfigurationFile(string Path) {
string
DataBuffer
;
string
DataBuffer
;
/////////Boolean////////////////////
/////////Boolean////////////////////
Bool_t
MUST2
=
false
;
bool
AnnularS1
=
false
;
Bool_t
CATS
=
false
;
bool
MUST2
=
false
;
Bool_t
SSSD
=
false
;
bool
CATS
=
false
;
Bool_t
Sharc
=
false
;
bool
SSSD
=
false
;
Bool_t
ChateauCristal
=
false
;
bool
Sharc
=
false
;
Bool_t
Exogam
=
false
;
bool
ChateauCristal
=
false
;
Bool_t
ScintillatorPlastic
=
false
;
bool
Exogam
=
false
;
Bool_t
SiLi
=
false
;
bool
ScintillatorPlastic
=
false
;
Bool_t
SiRes
=
false
;
bool
SiLi
=
false
;
Bool_t
LaBr3
=
false
;
bool
SiRes
=
false
;
Bool_t
IonisationChamber
=
false
;
bool
LaBr3
=
false
;
Bool_t
Trifoil
=
false
;
bool
IonisationChamber
=
false
;
Bool_t
Charissa
=
false
;
bool
Trifoil
=
false
;
Bool_t
GeneralTarget
=
false
;
bool
Charissa
=
false
;
Bool_t
GPDTracker
=
false
;
bool
GeneralTarget
=
false
;
Bool_t
HYD2Tracker
=
false
;
bool
GPDTracker
=
false
;
Bool_t
ParisDet
=
false
;
bool
HYD2Tracker
=
false
;
Bool_t
ShieldDet
=
false
;
bool
ParisDet
=
false
;
Bool_t
W1
=
false
;
bool
ShieldDet
=
false
;
Bool_t
S2
=
false
;
bool
W1
=
false
;
Bool_t
SPEG
=
false
;
bool
S2
=
false
;
Bool_t
EXL
=
false
;
bool
SPEG
=
false
;
Bool_t
TAC
=
false
;
bool
EXL
=
false
;
Bool_t
TiaraHyball
=
false
;
bool
TAC
=
false
;
Bool_t
TiaraBarrel
=
false
;
bool
TiaraHyball
=
false
;
bool
TiaraBarrel
=
false
;
//////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////
ifstream
ConfigFile
;
ifstream
ConfigFile
;
ConfigFile
.
open
(
Path
.
c_str
());
ConfigFile
.
open
(
Path
.
c_str
());
...
@@ -199,6 +201,27 @@ void DetectorManager::ReadConfigurationFile(string Path) {
...
@@ -199,6 +201,27 @@ void DetectorManager::ReadConfigurationFile(string Path) {
#endif
#endif
}
}
////////////////////////////////////////////
////// Search for Annular S1 Array //////
////////////////////////////////////////////
else
if
(
LineBuffer
.
compare
(
0
,
10
,
"AnnularS1"
)
==
0
&&
AnnularS1
==
false
)
{
#ifdef INC_ANNULARS1
AnnularS1
=
true
;
cout
<<
"//////// Annular S1 Array ////////"
<<
endl
<<
endl
;
// Instantiate the new array as a VDetector Object
VDetector
*
myDetector
=
new
TAnnularS1Physics
();
// Read Position of Telescope
ConfigFile
.
close
();
myDetector
->
ReadConfiguration
(
Path
);
ConfigFile
.
open
(
Path
.
c_str
());
// Add array to the VDetector Vector
AddDetector
(
"AnnularS1"
,
myDetector
);
#endif
}
////////////////////////////////////////////
////////////////////////////////////////////
//////// Search for MUST2 Array ////////
//////// Search for MUST2 Array ////////
////////////////////////////////////////////
////////////////////////////////////////////
...
...
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