Skip to content

Commit

Permalink
Correction so that D! stubs are processed in the correct order (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
aryd authored May 14, 2021
1 parent 3108980 commit 8f74207
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions L1Trigger/TrackFindingTracklet/interface/Settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ namespace trklet {
{{3.6, 3.8, 0.0, 0.0, 3.6, 0.0, 3.5, 3.8, 0.0, 0.0, 3.0, 3.0}}, //disk 4
{{0.0, 0.0, 0.0, 0.0, 3.6, 3.4, 3.7, 0.0, 0.0, 0.0, 0.0, 3.0}}}}; //disk 5

//returns the mean bend (in strips at a 1.8cm separation) for bendcode
//returns the mean bend (in strips at a 1.8 mm separation) for bendcode
std::array<std::array<double, 16>, 16> benddecode_{
{{{0.0, 0.5, 0.7, 0.8, 89.9, -1.0, -0.9, -0.8, 99.9, 99.9, 99.9, 99.9, 99.9, 99.9, 99.9, 99.9}}, //L1 PS
{{0.0, 0.7, 1.0, 1.5, 89.9, -1.5, -1.0, -0.7, 99.9, 99.9, 99.9, 99.9, 99.9, 99.9, 99.9, 99.9}}, //L2 PS
Expand All @@ -726,7 +726,7 @@ namespace trklet {
{{0.0, 2.0, 2.6, 3.2, 3.8, 4.0, 4.4, 4.4, 89.9, -4.4, -4.4, -4.0, -3.8, -3.2, -2.6, -2.0}}, //D4 2S
{{0.0, 2.0, 3.2, 3.4, 3.9, 3.9, 4.4, 4.4, 89.9, -4.4, -4.4, -3.9, -3.9, -3.4, -3.2, -2.0}}}}; //D5 2S

//returns the bend 'cut' (in strips at a 1.8cm separation) for bendcode
//returns the bend 'cut' (in strips at a 1.8 mm separation) for bendcode
std::array<std::array<double, 16>, 16> bendcut_{
{{{1.5, 1.2, 0.8, 0.8, 99.9, 0.8, 0.8, 1.2, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0}}, //L1 PS
{{1.5, 1.3, 1.0, 1.0, 99.9, 1.0, 1.0, 1.3, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0}}, //L2 PS
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/TrackFindingTracklet/src/VMRouter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void VMRouter::addInput(MemoryBase* memory, string input) {
InputLinkMemory* tmp1 = dynamic_cast<InputLinkMemory*>(memory);
assert(tmp1 != nullptr);
if (tmp1 != nullptr) {
if (layerdisk_ > N_LAYER && tmp1->getName().find("2S_") != string::npos) {
if (layerdisk_ >= N_LAYER && tmp1->getName().find("2S_") != string::npos) {
stubinputdisk2stmp_.push_back(tmp1);
} else {
stubinputtmp_.push_back(tmp1);
Expand Down

0 comments on commit 8f74207

Please sign in to comment.