diff --git a/macros/REST_CreateHisto.C b/macros/REST_CreateHisto.C index 91159d22b..dc299dc16 100644 --- a/macros/REST_CreateHisto.C +++ b/macros/REST_CreateHisto.C @@ -63,33 +63,33 @@ Int_t REST_CreateHisto(string varName, string rootFileName, TString histoName, i return 0; }; - // - // class REST_CreateHisto :public TRestTask { - // public: - // ClassDef(REST_CreateHisto, 1); - // - // REST_CreateHisto() { fNRequiredArgument = 3; } - // ~REST_CreateHisto() {} - // - // TString varName=""; - // TString rootFileName=""; - // TString histoName=""; - // int startVal = 0; - // int endVal = 1000; - // int bins = 1000; - // Double_t normFactor = 1; - // - // void RunTask(TRestManager*mgr) - // { - // REST_CreateHisto(varName, - // rootFileName, - // histoName, - // startVal, - // endVal, - // bins, - // normFactor); - // } - // - //}; +// +// class REST_CreateHisto :public TRestTask { +// public: +// ClassDef(REST_CreateHisto, 1); +// +// REST_CreateHisto() { fNRequiredArgument = 3; } +// ~REST_CreateHisto() {} +// +// TString varName=""; +// TString rootFileName=""; +// TString histoName=""; +// int startVal = 0; +// int endVal = 1000; +// int bins = 1000; +// Double_t normFactor = 1; +// +// void RunTask(TRestManager*mgr) +// { +// REST_CreateHisto(varName, +// rootFileName, +// histoName, +// startVal, +// endVal, +// bins, +// normFactor); +// } +// +//}; #endif diff --git a/macros/REST_ListMacros.C b/macros/REST_ListMacros.C index 3059259af..bfe6deea4 100644 --- a/macros/REST_ListMacros.C +++ b/macros/REST_ListMacros.C @@ -21,8 +21,7 @@ Int_t REST_ListMacros() { vector main_files = TRestTools::GetFilesMatchingPattern(macrosPath + "/REST_*.C"); for (int m = 0; m < main_files.size(); m++) { cout << " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" << endl; - cout << " ++ " - << " Macro : " << TRestTools::SeparatePathAndName(main_files[m]).second << endl; + cout << " ++ " << " Macro : " << TRestTools::SeparatePathAndName(main_files[m]).second << endl; std::ifstream t(main_files[m]); std::string str((std::istreambuf_iterator(t)), std::istreambuf_iterator()); @@ -44,8 +43,7 @@ Int_t REST_ListMacros() { for (int m = 0; m < files.size(); m++) { cout << " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" << endl; - cout << " ++ " - << " Macro : " << TRestTools::SeparatePathAndName(files[m]).second << endl; + cout << " ++ " << " Macro : " << TRestTools::SeparatePathAndName(files[m]).second << endl; std::ifstream t(files[m]); std::string str((std::istreambuf_iterator(t)), std::istreambuf_iterator()); diff --git a/macros/REST_MakeProcess.C b/macros/REST_MakeProcess.C index 452a1b93b..cf1b1a1a8 100644 --- a/macros/REST_MakeProcess.C +++ b/macros/REST_MakeProcess.C @@ -100,15 +100,12 @@ Int_t REST_MakeProcess(TString name, TString inputevent = "TRestEvent", TString headerfile << "private:" << endl; if (inputevent == outputevent) { - headerfile << " " - << "/// A pointer to the specific " << inputevent << " input event" << endl; + headerfile << " " << "/// A pointer to the specific " << inputevent << " input event" << endl; headerfile << " " << inputevent << "* " << inputeventname << "; //!" << endl; } else { - headerfile << " " - << "/// A pointer to the specific " << inputevent << " input event" << endl; + headerfile << " " << "/// A pointer to the specific " << inputevent << " input event" << endl; headerfile << " " << inputevent << "* " << inputeventname << "; //!" << endl; - headerfile << " " - << "/// A pointer to the specific " << outputevent << " output event" << endl; + headerfile << " " << "/// A pointer to the specific " << outputevent << " output event" << endl; headerfile << " " << outputevent << "* " << outputeventname << "; //!" << endl; } diff --git a/scripts/installAllTags.py b/scripts/installAllTags.py index bbee13496..0ac841378 100644 --- a/scripts/installAllTags.py +++ b/scripts/installAllTags.py @@ -24,9 +24,9 @@ # You might need to add some environment definitions needed to build REST os.environ["GARFIELD_HOME"] = "/programas/garfield" -os.environ[ - "LD_LIBRARY_PATH" -] = "/programas/root34.32/root/lib:/programas/geant4.10.02.p02-install/lib::/programas/garfield/lib" +os.environ["LD_LIBRARY_PATH"] = ( + "/programas/root34.32/root/lib:/programas/geant4.10.02.p02-install/lib::/programas/garfield/lib" +) os.environ["PATH"] = os.environ["PATH"] + ":/programas/root34.32/root/bin/" # =================================================== diff --git a/source/framework/core/src/TRestMesh.cxx b/source/framework/core/src/TRestMesh.cxx index 5ee2b74ba..f2ac78eef 100644 --- a/source/framework/core/src/TRestMesh.cxx +++ b/source/framework/core/src/TRestMesh.cxx @@ -195,8 +195,8 @@ Int_t TRestMesh::GetNodeX(TVector3 v, Bool_t relative) { if (posInside.Mag() > fNetSizeX) { cout << "REST WARNING (TRestMesh) : Relative position (" << posInside.X() << ", " << posInside.Y() - << ", " << posInside.Z() << ")" - << ") outside boundaries. Setting it to : " << fNodesX - 1 << endl; + << ", " << posInside.Z() << ")" << ") outside boundaries. Setting it to : " << fNodesX - 1 + << endl; return fNodesX - 1; } diff --git a/source/framework/core/src/TRestMessenger.cxx b/source/framework/core/src/TRestMessenger.cxx index 24c87a77d..843729e18 100644 --- a/source/framework/core/src/TRestMessenger.cxx +++ b/source/framework/core/src/TRestMessenger.cxx @@ -352,9 +352,8 @@ void TRestMessenger::PrintMetadata() { TRestMetadata::PrintMetadata(); if (IsConnected()) { - RESTMetadata << "Connected : " - << " (token: " << fPoolToken << ", shmid: " << fShmId << ", source: " << fPoolSource - << ")" << RESTendl; + RESTMetadata << "Connected : " << " (token: " << fPoolToken << ", shmid: " << fShmId + << ", source: " << fPoolSource << ")" << RESTendl; } else { RESTMetadata << "Not Connected" << RESTendl; } diff --git a/source/framework/core/src/TRestProcessRunner.cxx b/source/framework/core/src/TRestProcessRunner.cxx index 75758a91a..c9e489907 100644 --- a/source/framework/core/src/TRestProcessRunner.cxx +++ b/source/framework/core/src/TRestProcessRunner.cxx @@ -487,8 +487,7 @@ void TRestProcessRunner::RunProcess() { } if (fProcStatus != kIgnore && Console::kbhit()) - while (getchar() != '\n') - ; // clear buffer + while (getchar() != '\n'); // clear buffer RESTEssential << "Waiting for processes to finish ..." << RESTendl; @@ -592,8 +591,7 @@ void TRestProcessRunner::PauseMenu() { Console::CursorUp(1); int c = Console::Read(); if (c != '\n') - while (Console::Read() != '\n') - ; + while (Console::Read() != '\n'); TRestStringOutput::REST_Verbose_Level l; if (c == '0' || c == 's') { l = TRestStringOutput::REST_Verbose_Level::REST_Silent; diff --git a/source/framework/core/src/TRestTask.cxx b/source/framework/core/src/TRestTask.cxx index f1fbf0190..814f4388e 100644 --- a/source/framework/core/src/TRestTask.cxx +++ b/source/framework/core/src/TRestTask.cxx @@ -104,9 +104,7 @@ TRestTask::TRestTask(TString TaskString, REST_TASKMODE mode) { string name; string call; if (Split(cmd, "->").size() != 2) { - RESTWarning << "command" - << " \"" << cmd << "\" " - << "is illegal!" << RESTendl; + RESTWarning << "command" << " \"" << cmd << "\" " << "is illegal!" << RESTendl; fMode = TASK_ERROR; return; } else { @@ -117,9 +115,7 @@ TRestTask::TRestTask(TString TaskString, REST_TASKMODE mode) { int p1 = call.find_first_of("("); int p2 = call.find_last_of(")"); if (p1 == -1 || p2 == -1 || p1 >= p2) { - RESTWarning << "command" - << " \"" << cmd << "\" " - << "is illegal!" << RESTendl; + RESTWarning << "command" << " \"" << cmd << "\" " << "is illegal!" << RESTendl; fMode = TASK_ERROR; return; }