|
1 | | -// -*- C++ -*- |
2 | | -// |
3 | | -// Package: Core |
4 | | -// Class : FWOverlapTableManager |
5 | | -// |
6 | | -// Implementation: |
7 | | -// [Notes on implementation] |
8 | | -// |
9 | | -// Original Author: |
10 | | -// Created: Wed Jan 4 20:31:32 CET 2012 |
11 | | -// |
12 | | - |
13 | | -// system include files |
14 | | - |
15 | | -// user include files |
16 | 1 | #include "Fireworks/Core/src/FWOverlapTableManager.h" |
17 | 2 | #include "Fireworks/Core/src/FWOverlapTableView.h" |
18 | 3 | #include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h" |
|
34 | 19 |
|
35 | 20 | #include "TStopwatch.h" |
36 | 21 | #include "TTimer.h" |
37 | | -#include "TPRegexp.h" |
38 | 22 | #if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
39 | 23 | #include "TGeoPainter.h" |
40 | 24 | #else |
41 | 25 | #include "TGeoChecker.h" |
42 | 26 | #endif |
| 27 | +#include "TPRegexp.h" |
43 | 28 |
|
44 | 29 | FWOverlapTableManager::FWOverlapTableManager(FWOverlapTableView* v) : FWGeometryTableManagerBase(), m_browser(v) {} |
45 | 30 |
|
@@ -94,11 +79,11 @@ void FWOverlapTableManager::importOverlaps(std::string iPath, double iPrecision) |
94 | 79 |
|
95 | 80 | int oldS = 0; |
96 | 81 | timer->Start(); |
97 | | - #if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
| 82 | +#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
98 | 83 | geom->GetGeomPainter()->OpProgress(topVol->GetName(), icheck, ncheck, timer, kFALSE); |
99 | | - #else |
| 84 | +#else |
100 | 85 | geom->GetGeomChecker()->OpProgress(topVol->GetName(), icheck, ncheck, timer, kFALSE); |
101 | | - #endif |
| 86 | +#endif |
102 | 87 | // topVol->CheckOverlaps(iPrecision); |
103 | 88 | icheck++; |
104 | 89 | TGeoIterator git(topVol); |
@@ -144,11 +129,11 @@ void FWOverlapTableManager::importOverlaps(std::string iPath, double iPrecision) |
144 | 129 | // overlap bits |
145 | 130 | if (checkingOverlaps) { |
146 | 131 | if (!node->GetVolume()->IsSelected()) { |
147 | | - #if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
| 132 | +#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
148 | 133 | geom->GetGeomPainter()->OpProgress(node->GetVolume()->GetName(), icheck + 1, ncheck, timer, kFALSE); |
149 | | - #else |
| 134 | +#else |
150 | 135 | geom->GetGeomChecker()->OpProgress(node->GetVolume()->GetName(), icheck + 1, ncheck, timer, kFALSE); |
151 | | - #endif |
| 136 | +#endif |
152 | 137 | node->GetVolume()->SelectVolume(kFALSE); |
153 | 138 |
|
154 | 139 | node->GetVolume()->CheckOverlaps(iPrecision); |
@@ -196,11 +181,11 @@ void FWOverlapTableManager::importOverlaps(std::string iPath, double iPrecision) |
196 | 181 | obj = (TNamed*)overlaps->At(i); |
197 | 182 | obj->SetName(Form("ov%05d", i)); |
198 | 183 | } |
199 | | - #if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
| 184 | +#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0) |
200 | 185 | geom->GetGeomPainter()->OpProgress("Check overlaps:", icheck, ncheck, timer, kTRUE); |
201 | | - #else |
| 186 | +#else |
202 | 187 | geom->GetGeomChecker()->OpProgress("Check overlaps:", icheck, ncheck, timer, kTRUE); |
203 | | - #endif |
| 188 | +#endif |
204 | 189 | Info("CheckOverlaps", "Number of illegal overlaps/extrusions : %d\n", novlps); |
205 | 190 | delete timer; |
206 | 191 | } |
|
0 commit comments