Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mass and momentum smearing, moller vertices, analysis config updates #199

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
196fa1d
need to merge newest
Apr 26, 2024
8faa7b3
Merge branch 'master' of https://github.com/JeffersonLab/hpstr
Apr 26, 2024
ab706ea
junk
Apr 29, 2024
bef3d47
Merge branch 'master' of https://github.com/JeffersonLab/hpstr
Apr 29, 2024
900b5b8
updating a few things that the new verte ana processor uses. Added mo…
May 7, 2024
5f68ef8
made some changes to this processor that should be kept
Jun 5, 2024
6e4ad84
a few updates in here. Compatible with newest hps-java track data obj…
Jun 18, 2024
8afcac0
so the last commit didnt have the correct invm smearing. I've fixed t…
Jun 19, 2024
688b216
Update utils/src/TrackSmearingTool.cxx
alspellm Jun 20, 2024
5d34b6d
Update utils/src/TrackSmearingTool.cxx
alspellm Jun 20, 2024
e4baf27
add new nhits fee smearing script and values. Will need to adjust hps…
Jun 20, 2024
85c37eb
confirmed that data and smeared MC moller peaks match! Adding in othe…
Jun 20, 2024
5b1e868
when I added ele->setTrack in TrackSmearingTool, all changes to the t…
Jun 21, 2024
4c6b5f3
typo in path
Jun 21, 2024
4f0a2ed
fix conflict with current PR
Jun 21, 2024
d1a23b0
newest momentum smearing using KF tracks, split tob bottom by nhits
Jun 24, 2024
caf5a0e
organizing simp ana code
Jul 15, 2024
c2762c6
update
Jul 16, 2024
ae1080c
backup simp analysis scripts
Jul 24, 2024
1bd62a8
save
Jul 27, 2024
02c06a6
save
Aug 1, 2024
8ddb804
unknown save state
Aug 11, 2024
a679814
cleaning
Sep 4, 2024
939b492
adding systematic scripts
Sep 4, 2024
314242b
documenting
Sep 5, 2024
ee109f7
still documenting
Sep 6, 2024
fd2ebc6
documenting
Sep 9, 2024
d991e5c
more documentation
Sep 9, 2024
32d7ef1
rename file
Sep 10, 2024
f573bb1
adding some ana scripts
Sep 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions analysis/data/2016_mc_ana_corrections.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"corrections": {
"track_time": -5.5,
"track_cluster_dt": -0.7,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, this correction is never applied anywhere.

  • This JSON is loaded into tbc_configs_
  • tbc_configs_ is copied into trackBiasCorrections_
  • Track::applyCorrections is used for all entries in trackBiasCorrections_ but that function only does anything with "track_time" and "track_z0" and ignores everything else
  • Neither tbc_configs_ nor trackBiasCorrections_ are referenced anywhere else

Perhaps not applying this correction is okay? I don't expect a sub-ns shift in the difference between the cluster and track times to significantly affect the cutflow, but - for confusion purposes - it'd be better to know if it should be applied.

"track_z0": -0.06
}
}
4 changes: 4 additions & 0 deletions analysis/data/track_bias_corrections_data_2016.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"track_time": -1.5
}

5 changes: 5 additions & 0 deletions analysis/data/track_bias_corrections_tritrig_2016.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"track_time": -5.5,
"track_z0": -0.06
}

10 changes: 0 additions & 10 deletions analysis/data/v0_projection_2016_mc_7800_config.json

This file was deleted.

10 changes: 10 additions & 0 deletions analysis/data/v0_projection_2016_mc_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"7984": {
"target_position": -4.3,
"rotated_mean_x": -0.23135574671453285,
"rotated_mean_y": -0.02398086113913096,
"rotated_sigma_x": 0.2109738212614317,
"rotated_sigma_y": 0.08129743797473131,
"rotation_angle_mrad": -103.56647336269294
}
}
10 changes: 0 additions & 10 deletions analysis/data/v0_projection_2016_mc_signal_config.json

This file was deleted.

11 changes: 11 additions & 0 deletions analysis/include/AnaHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ class AnaHelpers {
* @return false
*/
bool GetParticlesFromVtx(Vertex* vtx, Particle*& ele, Particle*& pos);

/**
* @brief Get the Particles From Vtx object
*
* @param vtx
* @param ele1
* @param ele2
* @return true
* @return false
*/
bool GetSameParticlesFromVtx(Vertex* vtx, Particle*& ele1, Particle*& ele2);

/**
* @brief brief description
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,324 @@
{
"ele_track_cluster_EoverP_h": {
"bins" : 1000,
"minX" : 0.0,
"maxX" : 10.0,
"xtitle" : "e^{-} Track Cluster E/P",
"ytitle" : "Events"
},
"pos_track_cluster_EoverP_h": {
"bins" : 1000,
"minX" : 0.0,
"maxX" : 10.0,
"xtitle" : "e^{+} Track Cluster E/P",
"ytitle" : "Events"
},
"corr_eleClus_t_h": {
"bins" : 600,
"minX" : -30.0,
"maxX" : 30.0,
"xtitle" : "e^{-}_{clus} corr time [ns]",
"ytitle" : "Events"
},
"corr_posClus_t_h": {
"bins" : 600,
"minX" : -30.0,
"maxX" : 30.0,
"xtitle" : "e^{+}_{clus} corr time [ns]",
"ytitle" : "Events"
},
"ele_hitlayers_h": {
"bins" : 12,
"minX" : -0.5,
"maxX": 11.5,
"xtitle" : "hit layer",
"ytitle" : "nHits on Track"
},
"pos_hitlayers_h": {
"bins" : 12,
"minX" : -0.5,
"maxX": 11.5,
"xtitle" : "hit layer",
"ytitle" : "nHits on Track"
},
"ele_pos_clusTimeDiff_h": {
"bins" : 320,
"minX" : -16,
"maxX" : 16,
"xtitle" : "#Delta_{t}(e^{-},e^{+})_{clus} [ns]",
"ytitle" : "Events"
},
"ele_track_clus_dt_h": {
"bins" : 200,
"minX" : -20,
"maxX" : 20,
"xtitle" : "e^{-} Track Cluster #Delta_{t} [ns]",
"ytitle" : "Events"
},
"pos_track_clus_dt_h": {
"bins" : 200,
"minX" : -20,
"maxX" : 20,
"xtitle" : "e^{+} Track Cluster #Delta_{t} [ns]",
"ytitle" : "Events"
},
"ele_d0_h" : {
"bins" : 200,
"minX" : -10,
"maxX" : 10,
"xtitle" : "d_{0} [mm]",
"ytitle" : "Tracks"
},
"ele_Phi_h" : {
"bins" : 100,
"minX" : -0.4,
"maxX" : 0.4,
"xtitle" : "#phi_{0}",
"ytitle" : "Tracks"
},
"ele_Omega_h" : {
"bins" : 100,
"minX" : -0.001,
"maxX" : 0.001,
"xtitle" : "#omega",
"ytitle" : "Tracks"
},
"ele_TanLambda_h" : {
"bins" : 200,
"minX" : -0.2,
"maxX" : 0.2,
"xtitle" : "tan(#lambda)",
"ytitle" : "Tracks"
},
"ele_Z0_h" : {
"bins" : 200,
"minX" : -5,
"maxX" : 5,
"xtitle" : "z_{0} [mm]",
"ytitle" : "Tracks"
},
"ele_time_h" : {
"bins" : 200,
"minX" : -10,
"maxX" : 10,
"xtitle" : "track time [ns]",
"ytitle" : "Tracks"
},
"ele_chi2ndf_h" : {
"bins" : 200,
"minX" : 0,
"maxX" : 30,
"xtitle" : "ele track #chi^{2} / ndf",
"ytitle" : "Tracks"
},
"ele_chi2_h" : {
"bins" : 200,
"minX" : 0,
"maxX" : 20,
"xtitle" : "track #chi^{2}",
"ytitle" : "Tracks"
},
"ele_p_h" : {
"bins" : 250,
"minX" : 0,
"maxX" : 2.5,
"xtitle" : "p_{e^{-}} [GeV]",
"ytitle" : "Tracks"
},
"pos_d0_h" : {
"bins" : 200,
"minX" : -10,
"maxX" : 10,
"xtitle" : "d_{0} [mm]",
"ytitle" : "Tracks"
},
"pos_Phi_h" : {
"bins" : 100,
"minX" : -0.4,
"maxX" : 0.4,
"xtitle" : "#phi_{0}",
"ytitle" : "Tracks"
},
"pos_Omega_h" : {
"bins" : 100,
"minX" : -0.001,
"maxX" : 0.001,
"xtitle" : "#omega",
"ytitle" : "Tracks"
},
"pos_TanLambda_h" : {
"bins" : 200,
"minX" : -0.2,
"maxX" : 0.2,
"xtitle" : "tan(#lambda)",
"ytitle" : "Tracks"
},
"pos_Z0_h" : {
"bins" : 200,
"minX" : -5,
"maxX" : 5,
"xtitle" : "z_{0} [mm]",
"ytitle" : "Tracks"
},
"pos_time_h" : {
"bins" : 200,
"minX" : -10,
"maxX" : 10,
"xtitle" : "track time [ns]",
"ytitle" : "Tracks"
},
"pos_chi2ndf_h" : {
"bins" : 200,
"minX" : 0,
"maxX" : 30,
"xtitle" : "pos track #chi^{2} / ndf",
"ytitle" : "Tracks"
},
"pos_chi2_h" : {
"bins" : 200,
"minX" : 0,
"maxX" : 20,
"xtitle" : "track #chi^{2}",
"ytitle" : "Tracks"
},
"pos_p_h" : {
"bins" : 250,
"minX" : 0,
"maxX" : 2.5,
"xtitle" : "p_{e^{+}} [GeV]",
"ytitle" : "Tracks"
},
"vtx_chi2_h" : {
"bins" : 200,
"minX" : 0,
"maxX" : 30,
"xtitle" : "vtx #chi^{2}",
"ytitle" : "Vertices"
},
"vtx_X_svt_h" : {
"bins" : 200,
"minX" : -5,
"maxX" : 5,
"xtitle" : "vtx X pos [mm]",
"ytitle" : "Vertices"
},
"vtx_Y_svt_h" : {
"bins" : 200,
"minX" : -5,
"maxX" : 5,
"xtitle" : "vtx Y pos [mm]",
"ytitle" : "Vertices"
},
"vtx_Z_svt_h" : {
"bins" : 200,
"minX" : -50,
"maxX" : 50,
"xtitle" : "vtx Z pos [mm]",
"ytitle" : "Vertices"
},
"vtx_sigma_X_h" : {
"bins" : 100,
"minX" : 0,
"maxX" : 5,
"xtitle" : "vtx #sigma_{x} [mm]",
"ytitle" : "Vertices"
},
"vtx_sigma_Y_h" : {
"bins" : 100,
"minX" : 0,
"maxX" : 5,
"xtitle" : "vtx #sigma_{y} [mm]",
"ytitle" : "Vertices"
},
"vtx_sigma_Z_h" : {
"bins" : 100,
"minX" : 0,
"maxX" : 5,
"xtitle" : "vtx #sigma_{z} [mm]",
"ytitle" : "Vertices"
},
"vtx_InvM_h" : {
"bins" : 200,
"minX" : 0,
"maxX" : 0.2,
"xtitle" : "vtx Mass [GeV]",
"ytitle" : "Vertices"
},
"vtx_InvMErr_Z_h" : {
"bins" : 100,
"minX" : 0,
"maxX" : 0.05,
"xtitle" : "vtx #sigma_{z} [mm]",
"ytitle" : "Vertices"
},
"vtx_px_h" : {
"bins" : 300,
"minX" : -1.5,
"maxX" : 1.5,
"xtitle" : "vtx p_{x} [GeV]",
"ytitle" : "Vertices"
},
"vtx_py_h" : {
"bins" : 300,
"minX" : -1.5,
"maxX" : 1.5,
"xtitle" : "vtx p_{y} [GeV]",
"ytitle" : "Vertices"
},
"vtx_pz_h" : {
"bins" : 350,
"minX" : 0,
"maxX" : 3.5,
"xtitle" : "vtx p_{z} [GeV]",
"ytitle" : "Vertices"
},
"vtx_p_h" : {
"bins" : 350,
"minX" : 0,
"maxX" : 3.5,
"xtitle" : "vtx p [GeV]",
"ytitle" : "Vertices"
},
"vtx_Psum_h" : {
"bins" : 350,
"minX" : 0,
"maxX" : 3.5,
"xtitle" : "vtx p_{sum} [GeV]",
"ytitle" : "Vertices"
},
"vtx_Esum_h" : {
"bins" : 350,
"minX" : 0,
"maxX" : 3.5,
"xtitle" : "vtx E_{sum} [GeV]",
"ytitle" : "Vertices"
},
"Esum_h" : {
"bins" : 350,
"minX" : 0,
"maxX" : 3.5,
"xtitle" : "E_{e^{-}} + E_{e^{+}} [GeV]",
"ytitle" : "Events"
},
"Psum_h" : {
"bins" : 350,
"minX" : 0,
"maxX" : 3.5,
"xtitle" : "p_{e^{-}} + p_{e^{+}} [GeV]",
"ytitle" : "Events"
},
"hitCode_h" : {
"bins" : 16,
"minX" : -0.5,
"maxX" : 15.5,
"xtitle" : "hit code",
"ytitle" : "Tracks"
},
"vtx_proj_significance_h": {
"bins" : 200,
"minX" : 0.0,
"maxX" : 10.0,
"xtitle" : "vtx proj significance N#sigma",
"ytitle" : "Events"
}
}
Loading