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.

Sign up for GitHub

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

[Backport v1.18] Fix RP reco bug in p_y #1636

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[Backport v1.18] Fix RP reco bug in p_y #1636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf83c9c
Fix RP reco bug in p_y (#1634)
ajentsch Oct 16, 2024
ca80a2d
Merge branch 'v1.18' into backport-1634-to-v1.18
veprbl Oct 16, 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
36 changes: 19 additions & 17 deletions src/algorithms/fardetectors/MatrixTransferStatic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ void eicrecon::MatrixTransferStatic::process(
aY[1][0] = 0.0204108951; //c
aY[1][1] = -0.139318692; //d

local_x_offset = -0.339334;
local_y_offset = -0.000299454;
local_x_slope_offset = -0.219603248;
local_y_slope_offset = -0.000176128;
local_x_offset = -1209.29;//-0.339334; these are the local coordinate values
local_y_offset = 0.00132511;//-0.000299454;
local_x_slope_offset = -45.4772;//-0.219603248;
local_y_slope_offset = 0.000745498;//-0.000176128;

}
else if(abs(100.0 - nomMomentum)/100.0 < nomMomentumError){
Expand All @@ -99,10 +99,10 @@ void eicrecon::MatrixTransferStatic::process(
aY[1][0] = 0.0226283320; //c
aY[1][1] = -0.082666019; //d

local_x_offset = -0.329072;
local_y_offset = -0.00028343;
local_x_slope_offset = -0.218525084;
local_y_slope_offset = -0.00015321;
local_x_offset = -1209.27;//-0.329072;
local_y_offset = 0.00355218;//-0.00028343;
local_x_slope_offset = -45.4737;//-0.218525084;
local_y_slope_offset = 0.00204394;//-0.00015321;

}
else if(abs(41.0 - nomMomentum)/41.0 < nomMomentumError){
Expand All @@ -117,10 +117,10 @@ void eicrecon::MatrixTransferStatic::process(
aY[1][0] = 0.0179664765; //c
aY[1][1] = 0.004160679; //d

local_x_offset = -0.283273;
local_y_offset = -0.00552451;
local_x_slope_offset = -0.21174031;
local_y_slope_offset = -0.003212011;
local_x_offset = -1209.22;//-0.283273;
local_y_offset = 0.00868737;//-0.00552451;
local_x_slope_offset = -45.4641;//-0.21174031;
local_y_slope_offset = 0.00498786;//-0.003212011;

}
else if(abs(135.0 - nomMomentum)/135.0 < nomMomentumError){ //135 GeV deuterons
Expand Down Expand Up @@ -202,16 +202,16 @@ void eicrecon::MatrixTransferStatic::process(

if(!goodHit2 && gpos.z() > m_cfg.hit2minZ && gpos.z() < m_cfg.hit2maxZ){

goodHit[1].x = pos0.x();
goodHit[1].y = pos0.y();
goodHit[1].z = gpos.z();
goodHit[1].x = gpos.x(); //pos0.x() - pos0 is local coordinates, gpos is global
goodHit[1].y = gpos.y(); //pos0.y() - temporarily changing to global to solve the local coordinate issue
goodHit[1].z = gpos.z(); // - which is unique to the Roman pots situation
goodHit2 = true;

}
if(!goodHit1 && gpos.z() > m_cfg.hit1minZ && gpos.z() < m_cfg.hit1maxZ){

goodHit[0].x = pos0.x();
goodHit[0].y = pos0.y();
goodHit[0].x = gpos.x(); //pos0.x()
goodHit[0].y = gpos.y(); //pos0.y()
goodHit[0].z = gpos.z();
goodHit1 = true;

Expand Down Expand Up @@ -252,6 +252,8 @@ void eicrecon::MatrixTransferStatic::process(
}
}

Yip[1] = Yrp[0]/aY[0][1];

// convert polar angles to radians
double rsx = Xip[1] * dd4hep::mrad;
double rsy = Yip[1] * dd4hep::mrad;
Expand Down
Loading