Skip to content

Commit 4d021ac

Browse files
Chao1009Chao1009
authored
Merge branch 'main' into update-topocluster-reco-associations
2 parents 783c121 + 32d3800 commit 4d021ac

File tree

9 files changed

+35
-30
lines changed

9 files changed

+35
-30
lines changed

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ci:
22
skip: [clang-format]
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.6.0
5+
rev: v5.0.0
66
hooks:
77
- id: end-of-file-fixer
88
- id: trailing-whitespace

‎src/algorithms/fardetectors/MatrixTransferStatic.cc

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ void eicrecon::MatrixTransferStatic::process(
8181
aY[1][0] = 0.0204108951; //c
8282
aY[1][1] = -0.139318692; //d
8383

84-
local_x_offset = -0.339334;
85-
local_y_offset = -0.000299454;
86-
local_x_slope_offset = -0.219603248;
87-
local_y_slope_offset = -0.000176128;
84+
local_x_offset = -1209.29;//-0.339334; these are the local coordinate values
85+
local_y_offset = 0.00132511;//-0.000299454;
86+
local_x_slope_offset = -45.4772;//-0.219603248;
87+
local_y_slope_offset = 0.000745498;//-0.000176128;
8888

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

102-
local_x_offset = -0.329072;
103-
local_y_offset = -0.00028343;
104-
local_x_slope_offset = -0.218525084;
105-
local_y_slope_offset = -0.00015321;
102+
local_x_offset = -1209.27;//-0.329072;
103+
local_y_offset = 0.00355218;//-0.00028343;
104+
local_x_slope_offset = -45.4737;//-0.218525084;
105+
local_y_slope_offset = 0.00204394;//-0.00015321;
106106

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

120-
local_x_offset = -0.283273;
121-
local_y_offset = -0.00552451;
122-
local_x_slope_offset = -0.21174031;
123-
local_y_slope_offset = -0.003212011;
120+
local_x_offset = -1209.22;//-0.283273;
121+
local_y_offset = 0.00868737;//-0.00552451;
122+
local_x_slope_offset = -45.4641;//-0.21174031;
123+
local_y_slope_offset = 0.00498786;//-0.003212011;
124124

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

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

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

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

213-
goodHit[0].x = pos0.x();
214-
goodHit[0].y = pos0.y();
213+
goodHit[0].x = gpos.x(); //pos0.x()
214+
goodHit[0].y = gpos.y(); //pos0.y()
215215
goodHit[0].z = gpos.z();
216216
goodHit1 = true;
217217

@@ -252,6 +252,8 @@ void eicrecon::MatrixTransferStatic::process(
252252
}
253253
}
254254

255+
Yip[1] = Yrp[0]/aY[0][1];
256+
255257
// convert polar angles to radians
256258
double rsx = Xip[1] * dd4hep::mrad;
257259
double rsy = Yip[1] * dd4hep::mrad;

‎src/algorithms/tracking/ActsToTracks.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ void ActsToTracks::process(const Input& input, const Output& output) const {
120120
for (size_t j = 0; const auto& [b, y] : edm4eic_indexed_units) {
121121
// FIXME why not pars.getCovariance()(i,j) = covariance(a,b) / x / y;
122122
cov(i,j) = covariance(a,b) / x / y;
123+
++j;
123124
}
125+
++i;
124126
}
125127
pars.setCovariance(cov);
126128

‎src/algorithms/tracking/CKFTracking.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ namespace eicrecon {
109109
std::vector<ActsExamples::Trajectories*>,
110110
std::vector<ActsExamples::ConstTrackContainer*>
111111
>
112-
CKFTracking::process(const edm4eic::Measurement2DCollection& meas2Ds,
113-
const edm4eic::TrackParametersCollection &init_trk_params) {
112+
CKFTracking::process(const edm4eic::TrackParametersCollection& init_trk_params,
113+
const edm4eic::Measurement2DCollection& meas2Ds) {
114114

115115

116116
// create sourcelink and measurement containers

‎src/algorithms/tracking/CKFTracking.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ namespace eicrecon {
7474
std::vector<ActsExamples::Trajectories*>,
7575
std::vector<ActsExamples::ConstTrackContainer*>
7676
>
77-
process(const edm4eic::Measurement2DCollection& meas2Ds,
78-
const edm4eic::TrackParametersCollection &init_trk_params);
77+
process(const edm4eic::TrackParametersCollection& init_trk_params,
78+
const edm4eic::Measurement2DCollection& meas2Ds);
7979

8080
private:
8181
std::shared_ptr<spdlog::logger> m_log;

‎src/detectors/B0ECAL/B0ECAL.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ extern "C" {
3333
{"B0ECalRawHits"},
3434
#endif
3535
{
36-
.eRes = {0.0 * sqrt(dd4hep::GeV), 0.02, 0.0 * dd4hep::GeV},
36+
// The stochastic term is set using light yield in PbOW4 of N_photons = 145.75 / GeV / mm, for 6x6 mm2 sensors with PDE=0.18 (a=1/sqrt(145.75*36*0.18))
37+
.eRes = {0.0326 * sqrt(dd4hep::GeV), 0.00, 0.0 * dd4hep::GeV},
3738
.tRes = 0.0 * dd4hep::ns,
3839
.threshold= 5.0 * dd4hep::MeV,
3940
.capADC = 16384,
40-
.dyRangeADC = 20 * dd4hep::GeV,
41+
.dyRangeADC = 170 * dd4hep::GeV,
4142
.pedMeanADC = 100,
4243
.pedSigmaADC = 1,
4344
.resolutionTDC = 1e-11,
@@ -50,12 +51,12 @@ extern "C" {
5051
"B0ECalRecHits", {"B0ECalRawHits"}, {"B0ECalRecHits"},
5152
{
5253
.capADC = 16384,
53-
.dyRangeADC = 20. * dd4hep::GeV,
54+
.dyRangeADC = 170. * dd4hep::GeV,
5455
.pedMeanADC = 100,
5556
.pedSigmaADC = 1,
5657
.resolutionTDC = 1e-11,
5758
.thresholdFactor = 0.0,
58-
.thresholdValue = 0.0,
59+
.thresholdValue = 1.0, // using threshold of 10 photons = 10 MeV = 1 ADC
5960
.sampFrac = "0.998",
6061
.readout = "B0ECalHits",
6162
.sectorField = "sector",

‎src/detectors/BEMC/BEMC.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extern "C" {
6868
.resolutionTDC = EcalBarrelScFi_resolutionTDC,
6969
.thresholdFactor = 0.0, // use only thresholdValue
7070
.thresholdValue = 5.0, // 16384 ADC counts/1500 MeV * 0.5 MeV (desired threshold) = 5.46
71-
.sampFrac = "0.10200085",
71+
.sampFrac = "0.09320426",
7272
.readout = "EcalBarrelScFiHits",
7373
.layerField = "layer",
7474
.sectorField = "sector",

‎src/detectors/EEMC/EEMC.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extern "C" {
4040
{"EcalEndcapNRawHits"},
4141
#endif
4242
{
43-
.eRes = {0.0 * sqrt(dd4hep::GeV), 0.02, 0.0 * dd4hep::GeV},
43+
.eRes = {0.0 * sqrt(dd4hep::GeV), 0.0, 0.0 * dd4hep::GeV},
4444
.tRes = 0.0 * dd4hep::ns,
4545
.threshold = 0.0 * dd4hep::MeV, // Use ADC cut instead
4646
.capADC = EcalEndcapN_capADC,

‎src/global/tracking/CKFTracking_factory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class CKFTracking_factory :
5454
m_acts_trajectories_output(),
5555
m_acts_tracks_output()
5656
) = m_algo->process(
57-
*m_measurements_input(),
58-
*m_parameters_input()
57+
*m_parameters_input(),
58+
*m_measurements_input()
5959
);
6060
}
6161
};

0 commit comments

Comments
 (0)