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
dcb0b278
Commit
dcb0b278
authored
2 days ago
by
audrey.chatillon
Browse files
Options
Downloads
Patches
Plain Diff
[Epic] found some problem in the Sensitive volume. Missing part
parent
87dab772
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#397224
passed
2 days ago
Stage: build-NPLib
Stage: build-NPSimulation
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NPSimulation/Detectors/Epic/Epic.cc
+4
-0
4 additions, 0 deletions
NPSimulation/Detectors/Epic/Epic.cc
Projects/Epic_sim_proto/root/simulation/ReadGefEpicSimulatedTree.C
+7
-3
7 additions, 3 deletions
...Epic_sim_proto/root/simulation/ReadGefEpicSimulatedTree.C
with
11 additions
and
3 deletions
NPSimulation/Detectors/Epic/Epic.cc
+
4
−
0
View file @
dcb0b278
...
...
@@ -383,6 +383,7 @@ G4AssemblyVolume* Epic::BuildEpic(){
// cathode downstream anode i with or without the samples with the corresponding sensitive gas thickness
if
(
m_nSamplesPerA
.
at
(
i
)
==
1
){
// sensitive gas upstream anode i only
// FIXME : attention gas should surround the sample
G4Tubs
*
gas_KA
=
new
G4Tubs
(
"gas_KA"
,
0
,
m_RadiusAnode
,
0.5
*
(
m_Distance_AK
*
mm
-
m_SampleThickness
.
at
(
i
)
*
mm
),
0
,
360
*
deg
);
G4LogicalVolume
*
gas_KA_vol
=
new
G4LogicalVolume
(
gas_KA
,
m_GasMaterial
,
"gas_KA_log"
,
0
,
0
,
0
);
gas_KA_vol
->
SetSensitiveDetector
(
m_EpicScorer
);
...
...
@@ -394,6 +395,7 @@ G4AssemblyVolume* Epic::BuildEpic(){
m_mapping_A
[
cpt_AddVolumes
]
=
i
;
// if segemented anode, sensitive gas upstream external anode i
// FIXME : attention for external anode, gas is going up to the K, not to the sample
if
(
m_SegmentedAnode
){
G4Tubs
*
gas_KAfull
=
new
G4Tubs
(
"gas_KAfull"
,
0
,
37.
*
mm
,
0.5
*
(
m_Distance_AK
*
mm
-
m_SampleThickness
.
at
(
i
)
*
mm
),
0
,
360
*
deg
);
G4Tubs
*
openKAint
=
new
G4Tubs
(
"openKAint"
,
0
,
m_RadiusAnode
+
1.
*
mm
,
0.5
*
m_Distance_AK
*
mm
,
0
,
360
*
deg
);
...
...
@@ -418,6 +420,7 @@ G4AssemblyVolume* Epic::BuildEpic(){
}
else
if
(
m_nSamplesPerA
.
at
(
i
)
==
2
){
// sensitive gas upstream and downstream segmented anode i
// FIXME : attention gas should surround the sample
G4Tubs
*
gas
=
new
G4Tubs
(
"gas_around_A"
,
0
,
m_RadiusAnode
,
0.5
*
thickness_A
+
m_Distance_AK
*
mm
-
m_SampleThickness
.
at
(
i
)
*
mm
,
0
,
360
*
deg
);
G4Tubs
*
openA
=
new
G4Tubs
(
"openA"
,
0
,
38.
*
mm
,
0.5
*
thickness_A
,
0
,
360
*
deg
);
G4VSolid
*
gas_A
=
(
G4VSolid
*
)
new
G4SubtractionSolid
(
"gas_A"
,
gas
,
openA
,
0
,
G4ThreeVector
(
0
,
0
,
0
));
...
...
@@ -431,6 +434,7 @@ G4AssemblyVolume* Epic::BuildEpic(){
m_mapping_A
[
cpt_AddVolumes
]
=
i
;
// if segmented anode sensitive gas upstream and downstream segmented external anode i
// FIXME : attention for external anode, gas is going up to the K, not to the sample
if
(
m_SegmentedAnode
){
G4Tubs
*
gas_Afull
=
new
G4Tubs
(
"gas_around_Afull"
,
0
,
37.
*
mm
,
0.5
*
thickness_A
+
m_Distance_AK
*
mm
-
m_SampleThickness
.
at
(
i
)
*
mm
,
0
,
360
*
deg
);
G4Tubs
*
openAint
=
new
G4Tubs
(
"openAint"
,
0
,
m_RadiusAnode
+
1.
*
mm
,
thickness_A
+
m_Distance_AK
*
mm
,
0
,
360
*
deg
);
...
...
This diff is collapsed.
Click to expand it.
Projects/Epic_sim_proto/root/simulation/ReadGefEpicSimulatedTree.C
+
7
−
3
View file @
dcb0b278
...
...
@@ -27,6 +27,9 @@
#define Convolution_Gaussian_Sigma_ns 10
#define Convolution_Gaussian_Range_nSigma 3
//#define NameFile "P_890mbar"
#define NameFile "P_1bar"
void
run
()
{
...
...
@@ -37,7 +40,8 @@ void run()
TChain
*
t
=
new
TChain
(
"SimulatedTree"
);
for
(
int
file
=
1
;
file
<=
10
;
file
++
){
if
(
file
!=
3
)
t
->
Add
(
Form
(
"/media/audrey/DATA1/EPIC/simulation/K11_240Pu_nf_GEF_part%i.root"
,
file
));
//t->Add(Form("/media/audrey/DATA1/EPIC/simulation/%s/K11_240Pu_nf_GEF_part%i.root",NameFile,file));
t
->
Add
(
Form
(
"/media/audrey/DATA1/EPIC/simulation/%s/K11_240Pu_nf_GEF_part%i.root"
,
NameFile
,
file
));
}
t
->
ls
();
...
...
@@ -109,7 +113,7 @@ void run()
h1_QmaxInternal_m1
->
SetLineColor
(
kBlack
);
TH1D
*
h1_ic_Z
=
new
TH1D
(
"IC_Zpos"
,
"IC_Zpos"
,
10000
,
-
2
.
509
,
-
2
.
508
);
TH2D
*
h2_ic_YvsX
=
new
TH2D
(
"IC_YvsX"
,
"IC_YvsX"
,);
//
TH2D * h2_ic_YvsX = new TH2D("IC_YvsX","IC_YvsX",);
TH1D
*
h1_ic_Z_LowQmaxInt_m1
=
new
TH1D
(
"IC_Zpos_LowQmaxInt_m1"
,
"IZ_Zpos_LowQmaxInt"
,
10000
,
-
2
.
509
,
-
2
.
508
);
...
...
@@ -363,7 +367,7 @@ void run()
TFile
*
fsave
=
new
TFile
(
"/media/audrey/DATA1/EPIC/simulation/out_K11_GEF240Pu.root"
,
"recreate"
);
TFile
*
fsave
=
new
TFile
(
Form
(
"/media/audrey/DATA1/EPIC/simulation/
%s/
out_K11_GEF240Pu.root"
,
NameFile
),
"recreate"
);
can_Qmax
->
Write
();
h1_QmaxInternal
->
Write
();
h1_QmaxExternal
->
Write
();
...
...
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