diff --git a/core/base/utils/CbmFileUtils.cxx b/core/base/utils/CbmFileUtils.cxx
index 60af49a0d17435331b93d57211ad2a20291ef1de..af4b150a407c65b03903b34160325078da9a55d1 100644
--- a/core/base/utils/CbmFileUtils.cxx
+++ b/core/base/utils/CbmFileUtils.cxx
@@ -6,13 +6,17 @@
#include "TFile.h" // for TFile
#include "TObjArray.h"
-#include <string> // for string, find, substr
+#include <string> // for string, find, substr
+
#include <sys/stat.h> // for stcuct stat
-namespace Cbm {
- namespace File {
- bool IsRootFile(std::string filename) {
+namespace Cbm
+{
+ namespace File
+ {
+ bool IsRootFile(std::string filename)
+ {
// Currently plain root files and root files stored in a zip file are supported.
// The destiction between the two is a "#" in the filename string which separates the
// name of the zip file from the name of the root file which is inside the zip file.
@@ -30,7 +34,8 @@ namespace Cbm {
if (found != std::string::npos) {
checkFilename = filename.substr(0, found);
membername = filename.substr(found + 1);
- } else {
+ }
+ else {
checkFilename = filename;
}
@@ -40,9 +45,8 @@ namespace Cbm {
// In case of a root file contained in a zip archive check if the zip file
// exist
struct stat buffer;
- if (stat(checkFilename.c_str(), &buffer) == 0) {
- wasfound = kTRUE;
- } else {
+ if (stat(checkFilename.c_str(), &buffer) == 0) { wasfound = kTRUE; }
+ else {
wasfound = kFALSE;
LOG(error) << "Input File " << checkFilename << " not found";
}
@@ -55,31 +59,33 @@ namespace Cbm {
if (archive) {
TObjArray* members = archive->GetMembers();
if (members->FindObject(membername.c_str()) == 0) {
- LOG(error) << "File " << membername << " not found in zipfile "
- << checkFilename;
+ LOG(error) << "File " << membername << " not found in zipfile " << checkFilename;
wasfound = kFALSE;
- } else {
- LOG(info) << "File " << membername << " found in zipfile "
- << checkFilename;
+ }
+ else {
+ LOG(info) << "File " << membername << " found in zipfile " << checkFilename;
wasfound = kTRUE;
}
- } else {
- LOG(error) << "Zipfile " << checkFilename
- << " does not contain an archive";
+ }
+ else {
+ LOG(error) << "Zipfile " << checkFilename << " does not contain an archive";
wasfound = kFALSE;
}
fzip->Close();
delete fzip;
- } else {
+ }
+ else {
LOG(error) << "Could not open zipfile " << checkFilename;
wasfound = kFALSE;
}
- } else {
+ }
+ else {
TFile* rootfile = TFile::Open(checkFilename.c_str());
if (rootfile->IsOpen()) {
LOG(info) << "File " << checkFilename << " is a ROOT file.";
wasfound = kTRUE;
- } else {
+ }
+ else {
LOG(error) << "File " << checkFilename << " is no ROOT file.";
wasfound = kFALSE;
}
diff --git a/core/base/utils/CbmFileUtils.h b/core/base/utils/CbmFileUtils.h
index 01f14589c52fb946c6eb050433cb82c0ad32d883..a1be2369aa80f978f2f32255f711e6ee5bd73c60 100644
--- a/core/base/utils/CbmFileUtils.h
+++ b/core/base/utils/CbmFileUtils.h
@@ -3,8 +3,10 @@
#include <string> // for string
-namespace Cbm {
- namespace File {
+namespace Cbm
+{
+ namespace File
+ {
/**
* \brief Check if a the file exist and is a root file
* \param[in] filename The filename of the file to be checked
diff --git a/sim/transport/generators/CbmPlutoGenerator.cxx b/sim/transport/generators/CbmPlutoGenerator.cxx
index 1960220a27134fd8b39effcbf560ae80eb080eb9..476ad6442d49f59bed68ee6dd72894d9f3604ec3 100644
--- a/sim/transport/generators/CbmPlutoGenerator.cxx
+++ b/sim/transport/generators/CbmPlutoGenerator.cxx
@@ -9,10 +9,6 @@
#include "FairLogger.h"
#include "FairPrimaryGenerator.h" // for FairPrimaryGenerator
-#include "PDataBase.h" // for PDataBase
-#include "PParticle.h" // for PParticle
-#include "PStaticData.h" // for PStaticData
-
#include "TArchiveFile.h" // for TArchiveFile
#include "TChain.h" // for TChain
#include "TClonesArray.h" // for TClonesArray
@@ -21,7 +17,12 @@
#include "TLorentzVector.h" // for TLorentzVector
#include "TTree.h" // for TTree
#include "TVector3.h" // for TVector3
-#include <iosfwd> // for ostream
+
+#include <iosfwd> // for ostream
+
+#include "PDataBase.h" // for PDataBase
+#include "PParticle.h" // for PParticle
+#include "PStaticData.h" // for PStaticData
//#include <stddef.h> // for NULL
#include <iostream> // for operator<<, basic_ostream, etc
@@ -54,9 +55,9 @@ CbmPlutoGenerator::CbmPlutoGenerator(const Char_t* fileName)
if (Cbm::File::IsRootFile(fileName)) {
fInputChain->Add(fileName);
fInputChain->SetBranchAddress("Particles", &fParticles);
- LOG(info) << "CbmPlutoGenerator: Add file " << fileName
- << " to input chain";
- } else {
+ LOG(info) << "CbmPlutoGenerator: Add file " << fileName << " to input chain";
+ }
+ else {
LOG(fatal) << "Problem opening file " << fileName;
}
}
@@ -77,7 +78,8 @@ CbmPlutoGenerator::CbmPlutoGenerator(std::vector<std::string> fileNames)
if (Cbm::File::IsRootFile(name)) {
fInputChain->Add(name.c_str());
LOG(info) << "CbmPlutoGenerator: Add file " << name << " to input chain";
- } else {
+ }
+ else {
LOG(fatal) << "Problem opening file " << name;
}
}
diff --git a/sim/transport/steer/CbmTransport.cxx b/sim/transport/steer/CbmTransport.cxx
index 9943a72c0bd11ca357c135eef02a0b969e6e9df3..c79d77955a8bce1d620d92bba44ab471358b90a3 100644
--- a/sim/transport/steer/CbmTransport.cxx
+++ b/sim/transport/steer/CbmTransport.cxx
@@ -5,6 +5,27 @@
#include "CbmTransport.h"
+#include "CbmBeamProfile.h"
+#include "CbmEventGenerator.h"
+#include "CbmFieldMap.h"
+#include "CbmFieldPar.h"
+#include "CbmFileUtils.h"
+#include "CbmGeant3Settings.h"
+#include "CbmGeant4Settings.h"
+#include "CbmPlutoGenerator.h"
+#include "CbmSetup.h"
+#include "CbmStack.h"
+#include "CbmTarget.h"
+#include "CbmUnigenGenerator.h"
+
+#include "FairLogger.h"
+#include "FairMonitor.h"
+#include "FairParRootFileIo.h"
+#include "FairRunSim.h"
+#include "FairRuntimeDb.h"
+#include "FairSystemInfo.h"
+#include "FairUrqmdGenerator.h"
+
#include "TDatabasePDG.h"
#include "TG4RunConfiguration.h"
#include "TGeant3.h"
@@ -18,35 +39,15 @@
#include "TSystem.h"
#include "TVector3.h"
#include "TVirtualMC.h"
-#include <array>
+
#include <boost/filesystem.hpp>
+
+#include <array>
#include <cassert>
#include <iostream>
#include <sstream>
#include <string>
-#include "FairLogger.h"
-#include "FairMonitor.h"
-#include "FairParRootFileIo.h"
-#include "FairRunSim.h"
-#include "FairRuntimeDb.h"
-#include "FairSystemInfo.h"
-#include "FairUrqmdGenerator.h"
-
-#include "CbmBeamProfile.h"
-#include "CbmEventGenerator.h"
-#include "CbmFieldMap.h"
-#include "CbmFieldPar.h"
-#include "CbmFileUtils.h"
-#include "CbmPlutoGenerator.h"
-#include "CbmSetup.h"
-#include "CbmStack.h"
-#include "CbmTarget.h"
-#include "CbmUnigenGenerator.h"
-
-#include "CbmGeant3Settings.h"
-#include "CbmGeant4Settings.h"
-
using std::stringstream;
@@ -110,7 +111,8 @@ void CbmTransport::AddInput(const char* fileName, ECbmGenerator genType) {
LOG(fatal) << GetName() << ": Input file " << fileName << " not found!";
return;
}
- } else {
+ }
+ else {
if (!Cbm::File::IsRootFile(fileName)) {
LOG(fatal) << GetName() << ": Input file " << fileName << " not found!";
return;