Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
physics_benchmarks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
benchmarks
physics_benchmarks
Commits
09937517
Commit
09937517
authored
Jan 4, 2022
by
Kong Tu
Browse files
Options
Downloads
Patches
Plain Diff
change back for reco_local and analysis cuts Q2 and x_v
parent
1db9e777
Branches
Branches containing commit
No related tags found
1 merge request
!100
Draft: Diffractive phi benchmark development
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
benchmarks/diffractive_phi/analysis/diffractive_phi_analysis.cxx
+15
-13
15 additions, 13 deletions
...rks/diffractive_phi/analysis/diffractive_phi_analysis.cxx
benchmarks/diffractive_phi/reco_local.sh
+12
-12
12 additions, 12 deletions
benchmarks/diffractive_phi/reco_local.sh
with
27 additions
and
25 deletions
benchmarks/diffractive_phi/analysis/diffractive_phi_analysis.cxx
+
15
−
13
View file @
09937517
...
@@ -67,15 +67,17 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -67,15 +67,17 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
- scattered electron finder.
- scattered electron finder.
*/
*/
//y,Q2 cuts
//Q2,x_v cuts
auto
kineCut
=
[](
const
ROOT
::
VecOps
::
RVec
<
float
>&
qsq
,
const
ROOT
::
VecOps
::
RVec
<
float
>&
y_rec
)
{
auto
kineCut
=
[](
const
ROOT
::
VecOps
::
RVec
<
float
>&
qsq
,
const
ROOT
::
VecOps
::
RVec
<
float
>&
w_rec
)
{
if
(
qsq
.
size
()
<
1
||
y_rec
.
size
()
<
1
)
return
0
;
if
(
qsq
.
size
()
<
1
||
w_rec
.
size
()
<
1
)
return
0
;
if
(
qsq
[
0
]
>
1.
&&
qsq
[
0
]
<
20.
&&
y_rec
[
0
]
<
0.95
&&
y_rec
[
0
]
>
0.01
)
return
1
;
double
x_v
=
(
qsq
[
0
]
+
3.09
*
3.09
)
/
(
w_rec
*
w_rec
);
if
(
qsq
[
0
]
>
1.
&&
qsq
[
0
]
<
10.
&&
x_v
<
0.01
)
return
1
;
else
return
0
;
else
return
0
;
};
};
auto
d1
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
auto
d1
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
.
Define
(
"y_elec"
,
"InclusiveKinematicsElectron.y"
)
.
Define
(
"y_elec"
,
"InclusiveKinematicsElectron.y"
)
.
Define
(
"w_elec"
,
"InclusiveKinematicsElectron.W"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
...
@@ -87,7 +89,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -87,7 +89,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
.
Define
(
"vm"
,
vector_sum
,
{
"p1"
,
"p2"
}).
Define
(
"Mass"
,
getMass
,{
"vm"
}).
Define
(
"vm_rec_pt"
,
getPtVM
,
{
"vm"
}).
Define
(
"vm_rec_eta"
,
getEtaVM
,
{
"vm"
}).
Define
(
"vm_rec_rap"
,
getRapVM
,
{
"vm"
})
.
Define
(
"vm"
,
vector_sum
,
{
"p1"
,
"p2"
}).
Define
(
"Mass"
,
getMass
,{
"vm"
}).
Define
(
"vm_rec_pt"
,
getPtVM
,
{
"vm"
}).
Define
(
"vm_rec_eta"
,
getEtaVM
,
{
"vm"
}).
Define
(
"vm_rec_rap"
,
getRapVM
,
{
"vm"
})
.
Define
(
"protonREC"
,
findScatProton
,{
"ReconstructedFFParticles"
}).
Define
(
"proton_rec_p"
,
getP
,{
"protonREC"
})
.
Define
(
"protonREC"
,
findScatProton
,{
"ReconstructedFFParticles"
}).
Define
(
"proton_rec_p"
,
getP
,{
"protonREC"
})
.
Define
(
"mult"
,
getNtrk
,{
"ReconstructedChargedParticles"
})
.
Define
(
"mult"
,
getNtrk
,{
"ReconstructedChargedParticles"
})
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
y
_elec"
});
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
w
_elec"
});
auto
h_Q2_elec
=
d1
.
Histo1D
({
"h_Q2_elec"
,
"; GeV^2; counts"
,
100
,
-
5
,
25
},
"Q2_elec"
);
auto
h_Q2_elec
=
d1
.
Histo1D
({
"h_Q2_elec"
,
"; GeV^2; counts"
,
100
,
-
5
,
25
},
"Q2_elec"
);
auto
h_y_elec
=
d1
.
Histo1D
({
"h_y_elec"
,
"; ; counts"
,
100
,
0
,
1
},
"y_elec"
);
auto
h_y_elec
=
d1
.
Histo1D
({
"h_y_elec"
,
"; ; counts"
,
100
,
0
,
1
},
"y_elec"
);
...
@@ -108,11 +110,11 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -108,11 +110,11 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
*/
*/
auto
d2
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
auto
d2
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
.
Define
(
"
y
_elec"
,
"InclusiveKinematicsElectron.
y
"
)
.
Define
(
"
w
_elec"
,
"InclusiveKinematicsElectron.
W
"
)
.
Define
(
"scatElecMC"
,
findScatElecMC
,
{
"mcparticles"
}).
Define
(
"etaElecMC"
,
getEta
,{
"scatElecMC"
})
.
Define
(
"scatElecMC"
,
findScatElecMC
,
{
"mcparticles"
}).
Define
(
"etaElecMC"
,
getEta
,{
"scatElecMC"
})
.
Define
(
"VMMC"
,
findVMMC
,{
"mcparticles"
}).
Define
(
"MassMC"
,
getMass
,{
"VMMC"
}).
Define
(
"vm_mc_pt"
,
getPtVM
,{
"VMMC"
}).
Define
(
"vm_mc_eta"
,
getEtaVM
,{
"VMMC"
}).
Define
(
"vm_mc_rap"
,
getRapVM
,{
"VMMC"
})
.
Define
(
"VMMC"
,
findVMMC
,{
"mcparticles"
}).
Define
(
"MassMC"
,
getMass
,{
"VMMC"
}).
Define
(
"vm_mc_pt"
,
getPtVM
,{
"VMMC"
}).
Define
(
"vm_mc_eta"
,
getEtaVM
,{
"VMMC"
}).
Define
(
"vm_mc_rap"
,
getRapVM
,{
"VMMC"
})
.
Define
(
"VMMC_daugPlus"
,
findVM_DaugPlus_MC
,{
"mcparticles"
}).
Define
(
"etaVMMC_daugPlus"
,
getEta
,{
"VMMC_daugPlus"
}).
Define
(
"ptVMMC_daugPlus"
,
getPt
,{
"VMMC_daugPlus"
})
.
Define
(
"VMMC_daugPlus"
,
findVM_DaugPlus_MC
,{
"mcparticles"
}).
Define
(
"etaVMMC_daugPlus"
,
getEta
,{
"VMMC_daugPlus"
}).
Define
(
"ptVMMC_daugPlus"
,
getPt
,{
"VMMC_daugPlus"
})
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
y
_elec"
});
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
w
_elec"
});
auto
h_Eta_scatElec_MC
=
d2
.
Histo1D
({
"h_Eta_scatElec_MC"
,
";eta; counts"
,
100
,
-
11
,
9
},
"etaElecMC"
);
auto
h_Eta_scatElec_MC
=
d2
.
Histo1D
({
"h_Eta_scatElec_MC"
,
";eta; counts"
,
100
,
-
11
,
9
},
"etaElecMC"
);
auto
h_Mass_MC
=
d2
.
Histo1D
({
"h_Mass_MC"
,
";Mass; counts"
,
100
,
0
,
4
},
"MassMC"
);
auto
h_Mass_MC
=
d2
.
Histo1D
({
"h_Mass_MC"
,
";Mass; counts"
,
100
,
0
,
4
},
"MassMC"
);
...
@@ -129,7 +131,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -129,7 +131,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
*/
*/
auto
d3
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
auto
d3
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
.
Define
(
"
y
_elec"
,
"InclusiveKinematicsElectron.
y
"
)
.
Define
(
"
w
_elec"
,
"InclusiveKinematicsElectron.
W
"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
...
@@ -143,7 +145,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -143,7 +145,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
.
Define
(
"VMMC"
,
findVMMC
,{
"mcparticles"
})
.
Define
(
"VMMC"
,
findVMMC
,{
"mcparticles"
})
.
Define
(
"t_MC"
,
giveme_t_MC_E
,{
"VMMC"
,
"scatElecMC"
,
"mcparticles"
})
.
Define
(
"t_MC"
,
giveme_t_MC_E
,{
"VMMC"
,
"scatElecMC"
,
"mcparticles"
})
.
Define
(
"t_res"
,
giveme_resolution
,{
"t_MC"
,
"t_rec"
})
.
Define
(
"t_res"
,
giveme_resolution
,{
"t_MC"
,
"t_rec"
})
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
y
_elec"
});
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
w
_elec"
});
auto
h_t_rec
=
d3
.
Histo1D
({
"h_t_rec"
,
"; GeV^{2}; counts"
,
100
,
0
,
0.2
},
"t_rec"
);
auto
h_t_rec
=
d3
.
Histo1D
({
"h_t_rec"
,
"; GeV^{2}; counts"
,
100
,
0
,
0.2
},
"t_rec"
);
auto
h_t_MC
=
d3
.
Histo1D
({
"h_t_MC"
,
";t; counts"
,
100
,
0
,
0.2
},
"t_MC"
);
auto
h_t_MC
=
d3
.
Histo1D
({
"h_t_MC"
,
";t; counts"
,
100
,
0
,
0.2
},
"t_MC"
);
...
@@ -156,7 +158,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -156,7 +158,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
*/
*/
auto
d4
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
auto
d4
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
.
Define
(
"
y
_elec"
,
"InclusiveKinematicsElectron.
y
"
)
.
Define
(
"
w
_elec"
,
"InclusiveKinematicsElectron.
W
"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
...
@@ -177,7 +179,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -177,7 +179,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
.
Define
(
"VMMC_daugPlus"
,
findVM_DaugPlus_MC
,{
"mcparticles"
}).
Define
(
"ptVMMC_daugPlus"
,
getPt
,{
"VMMC_daugPlus"
}).
Define
(
"etaVMMC_daugPlus"
,
getEta
,{
"VMMC_daugPlus"
})
.
Define
(
"VMMC_daugPlus"
,
findVM_DaugPlus_MC
,{
"mcparticles"
}).
Define
(
"ptVMMC_daugPlus"
,
getPt
,{
"VMMC_daugPlus"
}).
Define
(
"etaVMMC_daugPlus"
,
getEta
,{
"VMMC_daugPlus"
})
.
Define
(
"VMMC_daugPlusMatchREC"
,
findVM_MC_match_REC
,{
"VMMC_daugPlus"
,
"p1"
}).
Define
(
"ptVMMC_daugPlus_match"
,
getPt
,{
"VMMC_daugPlusMatchREC"
}).
Define
(
"etaVMMC_daugPlus_match"
,
getEta
,{
"VMMC_daugPlusMatchREC"
})
.
Define
(
"VMMC_daugPlusMatchREC"
,
findVM_MC_match_REC
,{
"VMMC_daugPlus"
,
"p1"
}).
Define
(
"ptVMMC_daugPlus_match"
,
getPt
,{
"VMMC_daugPlusMatchREC"
}).
Define
(
"etaVMMC_daugPlus_match"
,
getEta
,{
"VMMC_daugPlusMatchREC"
})
.
Define
(
"p1_rec_pt"
,
getPt
,{
"p1"
}).
Define
(
"p1_res_pt"
,
resolution_MC_match_REC
,{
"VMMC_daugPlus"
,
"p1"
})
.
Define
(
"p1_rec_pt"
,
getPt
,{
"p1"
}).
Define
(
"p1_res_pt"
,
resolution_MC_match_REC
,{
"VMMC_daugPlus"
,
"p1"
})
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
y
_elec"
});
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
w
_elec"
});
auto
h_Pt_VM_MC_total
=
d4
.
Histo1D
({
"h_Pt_VM_MC_total"
,
"; GeV; counts"
,
50
,
0
,
5
},
"vm_mc_pt"
);
auto
h_Pt_VM_MC_total
=
d4
.
Histo1D
({
"h_Pt_VM_MC_total"
,
"; GeV; counts"
,
50
,
0
,
5
},
"vm_mc_pt"
);
auto
h_Pt_VM_MC_match
=
d4
.
Histo1D
({
"h_Pt_VM_MC_match"
,
"; GeV; counts"
,
50
,
0
,
5
},
"vm_mcMrec_pt"
);
auto
h_Pt_VM_MC_match
=
d4
.
Histo1D
({
"h_Pt_VM_MC_match"
,
"; GeV; counts"
,
50
,
0
,
5
},
"vm_mcMrec_pt"
);
...
@@ -217,7 +219,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -217,7 +219,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
};
};
auto
d5
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
auto
d5
=
d
.
Define
(
"Q2_elec"
,
"InclusiveKinematicsElectron.Q2"
)
.
Define
(
"
y
_elec"
,
"InclusiveKinematicsElectron.
y
"
)
.
Define
(
"
w
_elec"
,
"InclusiveKinematicsElectron.
W
"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_value"
,
"InclusiveKinematicsElectron.scatID.value"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_source"
,
"InclusiveKinematicsElectron.scatID.source"
)
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
.
Define
(
"scatID_cand_value"
,
scatID_cand_value
,
{
"scatID_value"
})
...
@@ -228,7 +230,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
...
@@ -228,7 +230,7 @@ int diffractive_phi_analysis(const std::string& config_name, const int vm_type=1
.
Define
(
"vm"
,
vector_sum
,
{
"p1"
,
"p2"
})
.
Define
(
"vm"
,
vector_sum
,
{
"p1"
,
"p2"
})
.
Define
(
"t_rec"
,
giveme_t_L
,
{
"vm"
,
"scatElec"
,
"mcparticles"
})
.
Define
(
"t_rec"
,
giveme_t_L
,
{
"vm"
,
"scatElec"
,
"mcparticles"
})
.
Filter
(
eventVetoCut
,{
"ReconstructedFFParticles"
,
"ReconstructedChargedParticles"
})
.
Filter
(
eventVetoCut
,{
"ReconstructedFFParticles"
,
"ReconstructedChargedParticles"
})
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
y
_elec"
});
.
Filter
(
kineCut
,{
"Q2_elec"
,
"
w
_elec"
});
auto
h_t_rec_veto
=
d5
.
Histo1D
({
"h_t_rec_veto"
,
"; GeV^{2}; counts"
,
100
,
0
,
0.2
},
"t_rec"
);
auto
h_t_rec_veto
=
d5
.
Histo1D
({
"h_t_rec_veto"
,
"; GeV^{2}; counts"
,
100
,
0
,
0.2
},
"t_rec"
);
...
...
This diff is collapsed.
Click to expand it.
benchmarks/diffractive_phi/reco_local.sh
+
12
−
12
View file @
09937517
...
@@ -59,18 +59,18 @@ PLOT_TAG=${CONFIG}
...
@@ -59,18 +59,18 @@ PLOT_TAG=${CONFIG}
## =============================================================================
## =============================================================================
## Step 2: Run the simulation
## Step 2: Run the simulation
#
echo "Running Geant4 simulation"
echo
"Running Geant4 simulation"
#
npsim --runType batch \
npsim
--runType
batch
\
#
--part.minimalKineticEnergy 1000*GeV \
--part
.minimalKineticEnergy 1000
*
GeV
\
#
-v INFO \
-v
INFO
\
#
--numberOfEvents ${JUGGLER_N_EVENTS} \
--numberOfEvents
${
JUGGLER_N_EVENTS
}
\
#
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--compactFile
${
DETECTOR_PATH
}
/
${
JUGGLER_DETECTOR
}
.xml
\
#
--inputFiles ${GEN_FILE} \
--inputFiles
${
GEN_FILE
}
\
#
--outputFile ${SIM_FILE}
--outputFile
${
SIM_FILE
}
#
if [ "$?" -ne "0" ] ; then
if
[
"
$?
"
-ne
"0"
]
;
then
#
echo "ERROR running npsim"
echo
"ERROR running npsim"
#
exit 1
exit
1
#
fi
fi
## =============================================================================
## =============================================================================
## Step 3: Run digitization & reconstruction
## Step 3: Run digitization & reconstruction
...
...
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