Skip to content

Commit fa7fadf

Browse files
fabiocosfabiocos
committed
Temporarily revert update of RecoMTD/DetLayers test output for compatibility with exsiting reference
1 parent 96da696 commit fa7fadf

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

‎RecoMTD/DetLayers/test/MTDRecoGeometryAnalyzer.cc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,14 @@ void MTDRecoGeometryAnalyzer::testETLLayersNew(const MTDDetLayerGeometry* geo, c
315315
LogVerbatim("MTDLayerDumpFull") << std::fixed << "ETLDetId " << modId.rawId() << " side = " << std::setw(4)
316316
<< modId.mtdSide() << " Disc/Side/Sector = " << std::setw(4) << modId.nDisc()
317317
<< " " << std::setw(4) << modId.discSide() << " " << std::setw(4)
318-
<< modId.sector() << " mod/type/sensor = " << std::setw(4) << modId.module()
319-
<< " " << std::setw(4) << modId.modType() << " " << std::setw(4)
320-
<< modId.sensor() << " pos = " << fvecround(imod->position(), 4);
318+
<< modId.sector() << " mod/type = " << std::setw(4) << modId.module() << " "
319+
<< std::setw(4) << modId.modType()
320+
<< " pos = " << fvecround(imod->position(), 4);
321321
LogVerbatim("MTDLayerDump") << std::fixed << "ETLDetId " << modId.rawId() << " side = " << std::setw(4)
322322
<< modId.mtdSide() << " Disc/Side/Sector = " << std::setw(4) << modId.nDisc() << " "
323323
<< std::setw(4) << modId.discSide() << " " << std::setw(4) << modId.sector()
324-
<< " mod/type/sensor = " << std::setw(4) << modId.module() << " " << std::setw(4)
325-
<< modId.modType() << " " << std::setw(4) << modId.sensor()
326-
<< " pos = " << fvecround(imod->position(), 2);
324+
<< " mod/type = " << std::setw(4) << modId.module() << " " << std::setw(4)
325+
<< modId.modType() << " pos = " << fvecround(imod->position(), 2);
327326
}
328327
}
329328
}

‎RecoMTD/DetLayers/test/TestETLNavigation.cc‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,14 @@ void TestETLNavigation::analyze(edm::StreamID, edm::Event const&, edm::EventSetu
9090
<< " side = " << std::setw(4) << modId.mtdSide()
9191
<< " Disc/Side/Sector = " << std::setw(4) << modId.nDisc() << " "
9292
<< std::setw(4) << modId.discSide() << " " << std::setw(4) << modId.sector()
93-
<< " mod/type/sens = " << std::setw(4) << modId.module() << " " << std::setw(4)
94-
<< modId.modType() << std::setw(4) << modId.sensor()
95-
<< " pos = " << fvecround(imod->position(), 4);
93+
<< " mod/type = " << std::setw(4) << modId.module() << " " << std::setw(4)
94+
<< modId.modType() << " pos = " << fvecround(imod->position(), 4);
9695
LogVerbatim("MTDLayerDump") << std::fixed << std::setw(5) << imodInd << " ETLDetId " << modId.rawId()
9796
<< " side = " << std::setw(4) << modId.mtdSide()
9897
<< " Disc/Side/Sector = " << std::setw(4) << modId.nDisc() << " " << std::setw(4)
9998
<< modId.discSide() << " " << std::setw(4) << modId.sector()
100-
<< " mod/type/sens = " << std::setw(4) << modId.module() << " " << std::setw(4)
101-
<< modId.modType() << std::setw(4) << modId.sensor()
102-
<< " pos = " << fvecround(imod->position(), 2);
99+
<< " mod/type = " << std::setw(4) << modId.module() << " " << std::setw(4)
100+
<< modId.modType() << " pos = " << fvecround(imod->position(), 2);
103101
for (int iside = -1; iside <= 1; iside += 2) {
104102
size_t idetNew = isector->hshift(modId, iside);
105103
if (idetNew >= isector->basicComponents().size()) {
@@ -112,15 +110,15 @@ void TestETLNavigation::analyze(edm::StreamID, edm::Event const&, edm::EventSetu
112110
LogVerbatim("MTDLayerDumpFull")
113111
<< std::fixed << "...............hshift= " << std::setw(2) << iside << " side = " << std::setw(4)
114112
<< newId.mtdSide() << " Disc/Side/Sector = " << std::setw(4) << newId.nDisc() << " " << std::setw(4)
115-
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type/sens = " << std::setw(4)
116-
<< newId.module() << " " << std::setw(4) << newId.modType() << std::setw(4) << newId.sensor()
113+
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type = " << std::setw(4)
114+
<< newId.module() << " " << std::setw(4) << newId.modType()
117115
<< " pos = " << fvecround(isector->basicComponents()[idetNew]->position(), 4);
118116
LogVerbatim("MTDLayerDump") << std::fixed << "...............hshift= " << std::setw(2) << iside
119117
<< " side = " << std::setw(4) << newId.mtdSide()
120118
<< " Disc/Side/Sector = " << std::setw(4) << newId.nDisc() << " "
121119
<< std::setw(4) << newId.discSide() << " " << std::setw(4) << newId.sector()
122-
<< " mod/type/sens = " << std::setw(4) << newId.module() << " " << std::setw(4)
123-
<< newId.modType() << std::setw(4) << newId.sensor()
120+
<< " mod/type = " << std::setw(4) << newId.module() << " " << std::setw(4)
121+
<< newId.modType()
124122
<< " pos = " << fvecround(isector->basicComponents()[idetNew]->position(), 2);
125123
}
126124
}
@@ -137,30 +135,30 @@ void TestETLNavigation::analyze(edm::StreamID, edm::Event const&, edm::EventSetu
137135
LogVerbatim("MTDLayerDumpFull")
138136
<< std::fixed << ".......closest.vshift= " << std::setw(2) << iside << " side = " << std::setw(4)
139137
<< newId.mtdSide() << " Disc/Side/Sector = " << std::setw(4) << newId.nDisc() << " " << std::setw(4)
140-
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type/sens = " << std::setw(4)
141-
<< newId.module() << " " << std::setw(4) << newId.modType() << std::setw(4) << newId.sensor()
138+
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type = " << std::setw(4)
139+
<< newId.module() << " " << std::setw(4) << newId.modType()
142140
<< " pos = " << fvecround(isector->basicComponents()[closest]->position(), 4);
143141
LogVerbatim("MTDLayerDump")
144142
<< std::fixed << ".......closest.vshift= " << std::setw(2) << iside << " side = " << std::setw(4)
145143
<< newId.mtdSide() << " Disc/Side/Sector = " << std::setw(4) << newId.nDisc() << " " << std::setw(4)
146-
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type/sens = " << std::setw(4)
147-
<< newId.module() << " " << std::setw(4) << newId.modType() << std::setw(4) << newId.sensor()
144+
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type = " << std::setw(4)
145+
<< newId.module() << " " << std::setw(4) << newId.modType()
148146
<< " pos = " << fvecround(isector->basicComponents()[closest]->position(), 2);
149147
}
150148
} else {
151149
ETLDetId newId(isector->basicComponents()[idetNew]->geographicalId().rawId());
152150
LogVerbatim("MTDLayerDumpFull")
153151
<< std::fixed << "...............vshift= " << std::setw(2) << iside << " side = " << std::setw(4)
154152
<< newId.mtdSide() << " Disc/Side/Sector = " << std::setw(4) << newId.nDisc() << " " << std::setw(4)
155-
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type/sens = " << std::setw(4)
156-
<< newId.module() << " " << std::setw(4) << newId.modType() << std::setw(4) << newId.sensor()
153+
<< newId.discSide() << " " << std::setw(4) << newId.sector() << " mod/type = " << std::setw(4)
154+
<< newId.module() << " " << std::setw(4) << newId.modType()
157155
<< " pos = " << fvecround(isector->basicComponents()[idetNew]->position(), 4);
158156
LogVerbatim("MTDLayerDump") << std::fixed << "...............vshift= " << std::setw(2) << iside
159157
<< " side = " << std::setw(4) << newId.mtdSide()
160158
<< " Disc/Side/Sector = " << std::setw(4) << newId.nDisc() << " "
161159
<< std::setw(4) << newId.discSide() << " " << std::setw(4) << newId.sector()
162-
<< " mod/type/sens = " << std::setw(4) << newId.module() << " " << std::setw(4)
163-
<< newId.modType() << std::setw(4) << newId.sensor()
160+
<< " mod/type = " << std::setw(4) << newId.module() << " " << std::setw(4)
161+
<< newId.modType()
164162
<< " pos = " << fvecround(isector->basicComponents()[idetNew]->position(), 2);
165163
}
166164
}

0 commit comments

Comments
 (0)