Skip to content

Commit

Permalink
Merge pull request #344 from trackreco/fixStereoLayers
Browse files Browse the repository at this point in the history 
Update phi boundaries in stereo layers, and use floor also in transition region for dphi hit selection windows
  • Loading branch information
@osschar
osschar authored Aug 16, 2021
2 parents d96ba1c + 18c95a8 commit 2cb5720
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 59 deletions.
56 changes: 28 additions & 28 deletions Geoms/CMS-2017.acc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,15 +877,15 @@ void Create_CMS_2017_AutoGen(TrackerInfo &ti, IterationsInfo &ii)
}
{
IterationLayerConfig & obj = ic.layer(5);
obj.set_selection_limits(0.023000, 0.030000, 6.000000, 12.000000);
obj.set_selection_limits(0.025000, 0.037000, 6.000000, 12.000000);
}
{
IterationLayerConfig & obj = ic.layer(6);
obj.set_selection_limits(0.010000, 0.015000, 6.000000, 12.000000);
}
{
IterationLayerConfig & obj = ic.layer(7);
obj.set_selection_limits(0.016000, 0.030000, 6.000000, 12.000000);
obj.set_selection_limits(0.018000, 0.027000, 6.000000, 12.000000);
}
{
IterationLayerConfig & obj = ic.layer(8);
Expand All @@ -901,15 +901,15 @@ void Create_CMS_2017_AutoGen(TrackerInfo &ti, IterationsInfo &ii)
}
{
IterationLayerConfig & obj = ic.layer(11);
obj.set_selection_limits(0.016000, 0.030000, 9.500000, 19.000000);
obj.set_selection_limits(0.016000, 0.032000, 9.500000, 19.000000);
}
{
IterationLayerConfig & obj = ic.layer(12);
obj.set_selection_limits(0.010000, 0.015000, 9.500000, 19.000000);
}
{
IterationLayerConfig & obj = ic.layer(13);
obj.set_selection_limits(0.013000, 0.030000, 9.500000, 19.000000);
obj.set_selection_limits(0.014000, 0.028000, 9.500000, 19.000000);
}
{
IterationLayerConfig & obj = ic.layer(14);
Expand Down Expand Up @@ -945,95 +945,95 @@ void Create_CMS_2017_AutoGen(TrackerInfo &ti, IterationsInfo &ii)
}
{
IterationLayerConfig & obj = ic.layer(22);
obj.set_selection_limits(0.010000, 0.030000, 5.500000, 11.000000);
obj.set_selection_limits(0.025000, 0.050000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(23);
obj.set_selection_limits(0.010000, 0.015000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(24);
obj.set_selection_limits(0.010000, 0.030000, 5.500000, 11.000000);
obj.set_selection_limits(0.025000, 0.050000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(25);
obj.set_selection_limits(0.010000, 0.015000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(26);
obj.set_selection_limits(0.010000, 0.030000, 5.500000, 11.000000);
obj.set_selection_limits(0.025000, 0.050000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(27);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(28);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.018500, 0.037000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(29);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(30);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.018500, 0.037000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(31);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(32);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.018500, 0.037000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(33);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(34);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.014000, 0.028000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(35);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(36);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.014000, 0.028000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(37);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(38);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.014000, 0.028000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(39);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(40);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.012500, 0.025000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(41);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(42);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.012500, 0.025000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(43);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(44);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.012500, 0.025000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(45);
Expand All @@ -1053,95 +1053,95 @@ void Create_CMS_2017_AutoGen(TrackerInfo &ti, IterationsInfo &ii)
}
{
IterationLayerConfig & obj = ic.layer(49);
obj.set_selection_limits(0.010000, 0.030000, 5.500000, 11.000000);
obj.set_selection_limits(0.025000, 0.050000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(50);
obj.set_selection_limits(0.010000, 0.015000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(51);
obj.set_selection_limits(0.010000, 0.030000, 5.500000, 11.000000);
obj.set_selection_limits(0.025000, 0.050000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(52);
obj.set_selection_limits(0.010000, 0.015000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(53);
obj.set_selection_limits(0.010000, 0.030000, 5.500000, 11.000000);
obj.set_selection_limits(0.025000, 0.050000, 5.500000, 11.000000);
}
{
IterationLayerConfig & obj = ic.layer(54);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(55);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.018500, 0.037000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(56);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(57);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.018500, 0.037000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(58);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(59);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.018500, 0.037000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(60);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(61);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.014000, 0.028000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(62);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(63);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.014000, 0.028000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(64);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(65);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.014000, 0.028000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(66);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(67);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.012500, 0.025000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(68);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(69);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.012500, 0.025000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(70);
obj.set_selection_limits(0.010000, 0.015000, 10.000000, 20.000000);
}
{
IterationLayerConfig & obj = ic.layer(71);
obj.set_selection_limits(0.010000, 0.030000, 10.000000, 20.000000);
obj.set_selection_limits(0.012500, 0.025000, 10.000000, 20.000000);
}
}
}
20 changes: 10 additions & 10 deletions Geoms/CMS-2017.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ namespace
ip.nlayers_per_seed = 4;
ip.maxCandsPerSeed = 5;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -109,7 +109,7 @@ namespace
ip.nlayers_per_seed = 3;
ip.maxCandsPerSeed = 5;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -119,7 +119,7 @@ namespace
ip.nlayers_per_seed = 4;
ip.maxCandsPerSeed = 5;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -129,7 +129,7 @@ namespace
ip.nlayers_per_seed = 3;
ip.maxCandsPerSeed = 5;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -139,7 +139,7 @@ namespace
ip.nlayers_per_seed = 4;
ip.maxCandsPerSeed = 5;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -149,7 +149,7 @@ namespace
ip.nlayers_per_seed = 3;
ip.maxCandsPerSeed = 5;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -159,7 +159,7 @@ namespace
ip.nlayers_per_seed = 3;
ip.maxCandsPerSeed = 2;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -169,7 +169,7 @@ namespace
ip.nlayers_per_seed = 3;
ip.maxCandsPerSeed = 2;
ip.maxHolesPerCand = 0;
ip.maxConsecHoles = 0;
ip.maxConsecHoles = 1;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -179,7 +179,7 @@ namespace
ip.nlayers_per_seed = 3;
ip.maxCandsPerSeed = 2;
ip.maxHolesPerCand = 0;
ip.maxConsecHoles = 0;
ip.maxConsecHoles = 1;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand All @@ -189,7 +189,7 @@ namespace
ip.nlayers_per_seed = 2;
ip.maxCandsPerSeed = 3;
ip.maxHolesPerCand = 4;
ip.maxConsecHoles = 1;
ip.maxConsecHoles = 2;
ip.chi2Cut_min = 10.0;
ip.chi2CutOverlap = 3.5;
ip.pTCutOverlap = 1;
Expand Down
30 changes: 15 additions & 15 deletions Geoms/CMS-2017/make_trk_info.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,28 @@ struct { float pmin, pmax, qmin, qmax; } SelWindows[] = {
// PIX B
{ 0.01, 0.05, 1.0, 2.0 }, { 0.01, 0.05, 1.0, 2.0 }, { 0.01, 0.05, 1.0, 2.0 }, { 0.01, 0.05, 1.0, 2.0 },
// STRIP B
{ 0.01, 0.015, 6.0, 12.0 }, { 0.023, 0.03, 6.0, 12.0 }, { 0.01, 0.015, 6.0, 12.0 }, { 0.016, 0.03, 6.0, 12.0 },
{ 0.01, 0.015, 6.0, 12.0 }, { 0.01, 0.015, 6.0, 12.0 }, { 0.01, 0.015, 9.5, 19.0 }, { 0.016, 0.03, 9.5, 19.0 },
{ 0.01, 0.015, 9.5, 19.0 }, { 0.013, 0.03, 9.5, 19.0 }, { 0.01, 0.015, 9.5, 19.0 }, { 0.01, 0.015, 9.5, 19.0 },
{ 0.01, 0.015, 6.0, 12.0 }, { 0.025, 0.037, 6.0, 12.0 }, { 0.01, 0.015, 6.0, 12.0 }, { 0.018, 0.027, 6.0, 12.0 },
{ 0.01, 0.015, 6.0, 12.0 }, { 0.01, 0.015, 6.0, 12.0 }, { 0.01, 0.015, 9.5, 19.0 }, { 0.016, 0.032, 9.5, 19.0 },
{ 0.01, 0.015, 9.5, 19.0 }, { 0.014, 0.028, 9.5, 19.0 }, { 0.01, 0.015, 9.5, 19.0 }, { 0.01, 0.015, 9.5, 19.0 },
{ 0.01, 0.015, 9.5, 19.0 }, { 0.01, 0.015, 9.5, 19.0 },
// PIX EC POS
{ 0.01, 0.015, 0.8, 1.6 }, { 0.01, 0.015, 0.8, 1.6 }, { 0.01, 0.015, 0.8, 1.6 },
// STRIP EC POS
{ 0.01, 0.015, 5.5, 11.0 }, { 0.01, 0.03, 5.5, 11.0 }, { 0.01, 0.015, 5.5, 11.0 }, { 0.01, 0.03, 5.5, 11.0 },
{ 0.01, 0.015, 5.5, 11.0 }, { 0.01, 0.03, 5.5, 11.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 5.5, 11.0 }, { 0.025, 0.05, 5.5, 11.0 }, { 0.01, 0.015, 5.5, 11.0 }, { 0.025, 0.05, 5.5, 11.0 },
{ 0.01, 0.015, 5.5, 11.0 }, { 0.025, 0.05, 5.5, 11.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0185, 0.037, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.0185, 0.037, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0185, 0.037, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.014, 0.028, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.014, 0.028, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.014, 0.028, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0125, 0.025, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.0125, 0.025, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0125, 0.025, 10.0, 20.0 },
// PIX EC NEG
{ 0.01, 0.015, 0.8, 1.6 }, { 0.01, 0.015, 0.8, 1.6 }, { 0.01, 0.015, 0.8, 1.6 },
// STRIP EC NEG
{ 0.01, 0.015, 5.5, 11.0 }, { 0.01, 0.03, 5.5, 11.0 }, { 0.01, 0.015, 5.5, 11.0 }, { 0.01, 0.03, 5.5, 11.0 },
{ 0.01, 0.015, 5.5, 11.0 }, { 0.01, 0.03, 5.5, 11.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.01, 0.03, 10.0, 20.0 }
{ 0.01, 0.015, 5.5, 11.0 }, { 0.025, 0.05, 5.5, 11.0 }, { 0.01, 0.015, 5.5, 11.0 }, { 0.025, 0.05, 5.5, 11.0 },
{ 0.01, 0.015, 5.5, 11.0 }, { 0.025, 0.05, 5.5, 11.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0185, 0.037, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.0185, 0.037, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0185, 0.037, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.014, 0.028, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.014, 0.028, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.014, 0.028, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0125, 0.025, 10.0, 20.0 },
{ 0.01, 0.015, 10.0, 20.0 }, { 0.0125, 0.025, 10.0, 20.0 }, { 0.01, 0.015, 10.0, 20.0 }, { 0.0125, 0.025, 10.0, 20.0 }
};

constexpr int N_barrel = 18;
Expand Down
Loading

0 comments on commit 2cb5720

Please sign in to comment.