Skip to content

Commit 18fb2db

Browse files
committed
Corrected the code format
1 parent bd39483 commit 18fb2db

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

Fireworks/Core/src/FWOverlapTableManager.cc

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
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
161
#include "Fireworks/Core/src/FWOverlapTableManager.h"
172
#include "Fireworks/Core/src/FWOverlapTableView.h"
183
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
@@ -34,12 +19,12 @@
3419

3520
#include "TStopwatch.h"
3621
#include "TTimer.h"
37-
#include "TPRegexp.h"
3822
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
3923
#include "TGeoPainter.h"
4024
#else
4125
#include "TGeoChecker.h"
4226
#endif
27+
#include "TPRegexp.h"
4328

4429
FWOverlapTableManager::FWOverlapTableManager(FWOverlapTableView* v) : FWGeometryTableManagerBase(), m_browser(v) {}
4530

@@ -94,11 +79,11 @@ void FWOverlapTableManager::importOverlaps(std::string iPath, double iPrecision)
9479

9580
int oldS = 0;
9681
timer->Start();
97-
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
82+
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
9883
geom->GetGeomPainter()->OpProgress(topVol->GetName(), icheck, ncheck, timer, kFALSE);
99-
#else
84+
#else
10085
geom->GetGeomChecker()->OpProgress(topVol->GetName(), icheck, ncheck, timer, kFALSE);
101-
#endif
86+
#endif
10287
// topVol->CheckOverlaps(iPrecision);
10388
icheck++;
10489
TGeoIterator git(topVol);
@@ -144,11 +129,11 @@ void FWOverlapTableManager::importOverlaps(std::string iPath, double iPrecision)
144129
// overlap bits
145130
if (checkingOverlaps) {
146131
if (!node->GetVolume()->IsSelected()) {
147-
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
132+
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
148133
geom->GetGeomPainter()->OpProgress(node->GetVolume()->GetName(), icheck + 1, ncheck, timer, kFALSE);
149-
#else
134+
#else
150135
geom->GetGeomChecker()->OpProgress(node->GetVolume()->GetName(), icheck + 1, ncheck, timer, kFALSE);
151-
#endif
136+
#endif
152137
node->GetVolume()->SelectVolume(kFALSE);
153138

154139
node->GetVolume()->CheckOverlaps(iPrecision);
@@ -196,11 +181,11 @@ void FWOverlapTableManager::importOverlaps(std::string iPath, double iPrecision)
196181
obj = (TNamed*)overlaps->At(i);
197182
obj->SetName(Form("ov%05d", i));
198183
}
199-
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
184+
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 37, 0)
200185
geom->GetGeomPainter()->OpProgress("Check overlaps:", icheck, ncheck, timer, kTRUE);
201-
#else
186+
#else
202187
geom->GetGeomChecker()->OpProgress("Check overlaps:", icheck, ncheck, timer, kTRUE);
203-
#endif
188+
#endif
204189
Info("CheckOverlaps", "Number of illegal overlaps/extrusions : %d\n", novlps);
205190
delete timer;
206191
}

0 commit comments

Comments
 (0)