diff --git a/inc/TRestDetectorHitsReadoutAnalysisProcess.h b/inc/TRestDetectorHitsReadoutAnalysisProcess.h index ece71bcd..77edbc0a 100644 --- a/inc/TRestDetectorHitsReadoutAnalysisProcess.h +++ b/inc/TRestDetectorHitsReadoutAnalysisProcess.h @@ -21,7 +21,7 @@ class TRestDetectorHitsReadoutAnalysisProcess : public TRestEventProcess { void InitFromConfigFile() override; void Initialize() override; - void LoadDefaultConfig(){}; + void LoadDefaultConfig() {}; /// \brief This process will only work on hits corresponding to this channel type (using readout) std::string fChannelType; diff --git a/src/TRestDetectorHitsReadoutAnalysisProcess.cxx b/src/TRestDetectorHitsReadoutAnalysisProcess.cxx index 9ba22c46..29d20300 100644 --- a/src/TRestDetectorHitsReadoutAnalysisProcess.cxx +++ b/src/TRestDetectorHitsReadoutAnalysisProcess.cxx @@ -101,8 +101,8 @@ void TRestDetectorHitsReadoutAnalysisProcess::InitProcess() { } if (fChannelType == "") { - cerr << "TRestDetectorHitsReadoutAnalysisProcess::InitProcess() : " - << "Channel type not defined" << endl; + cerr << "TRestDetectorHitsReadoutAnalysisProcess::InitProcess() : " << "Channel type not defined" + << endl; exit(1); } } diff --git a/src/TRestDetectorReadoutModule.cxx b/src/TRestDetectorReadoutModule.cxx index 8fd0f81b..2715788d 100644 --- a/src/TRestDetectorReadoutModule.cxx +++ b/src/TRestDetectorReadoutModule.cxx @@ -628,8 +628,8 @@ void TRestDetectorReadoutModule::Print(Int_t DetailLevel) { RESTMetadata << "Decoding was defined : " << (fDecoding ? "Yes" : "No") << RESTendl; RESTMetadata << "-- First DAQ Channel: " << fFirstDaqChannel << RESTendl; RESTMetadata << "-- Number of mapping nodes: " << fMappingNodes << RESTendl; - RESTMetadata << "-- Origin position : X = " << fOrigin.X() << " mm " - << " Y : " << fOrigin.Y() << " mm" << RESTendl; + RESTMetadata << "-- Origin position : X = " << fOrigin.X() << " mm " << " Y : " << fOrigin.Y() + << " mm" << RESTendl; RESTMetadata << "-- Size : X = " << fSize.X() << " Y : " << fSize.Y() << RESTendl; RESTMetadata << "-- Rotation : " << fRotation * units("degrees") << " degrees" << RESTendl; RESTMetadata << "-- Total channels : " << GetNumberOfChannels() << RESTendl; diff --git a/src/TRestDetectorReadoutPixel.cxx b/src/TRestDetectorReadoutPixel.cxx index 03a1593d..c33826b3 100644 --- a/src/TRestDetectorReadoutPixel.cxx +++ b/src/TRestDetectorReadoutPixel.cxx @@ -147,8 +147,7 @@ TVector2 TRestDetectorReadoutPixel::TransformToPixelCoordinates(const TVector2& void TRestDetectorReadoutPixel::Print() const { std::cout << " ## Pixel position : (" << GetOriginX() << "," << GetOriginY() << ") mm size : (" << GetSizeX() << "," << GetSizeY() << ") mm" << std::endl; - std::cout << " rotation : " << fRotation << " degrees" - << " type : "; + std::cout << " rotation : " << fRotation << " degrees" << " type : "; if (fTriangle) std::cout << "triangle" << std::endl; else diff --git a/src/TRestDetectorReadoutPlane.cxx b/src/TRestDetectorReadoutPlane.cxx index 69a7a769..05439ddd 100644 --- a/src/TRestDetectorReadoutPlane.cxx +++ b/src/TRestDetectorReadoutPlane.cxx @@ -345,12 +345,12 @@ void TRestDetectorReadoutPlane::Print(Int_t DetailLevel) { if (DetailLevel >= 0) { RESTMetadata << "-- Readout plane : " << GetID() << RESTendl; RESTMetadata << "----------------------------------------------------------------" << RESTendl; - RESTMetadata << "-- Position : X = " << fPosition.X() << " mm, " - << " Y : " << fPosition.Y() << " mm, Z : " << fPosition.Z() << " mm" << RESTendl; - RESTMetadata << "-- Normal vector : X = " << fNormal.X() << " mm, " - << " Y : " << fNormal.Y() << " mm, Z : " << fNormal.Z() << " mm" << RESTendl; - RESTMetadata << "-- X-axis vector : X = " << fAxisX.X() << " mm, " - << " Y : " << fAxisX.Y() << " mm, Z : " << fAxisX.Z() << " mm" << RESTendl; + RESTMetadata << "-- Position : X = " << fPosition.X() << " mm, " << " Y : " << fPosition.Y() + << " mm, Z : " << fPosition.Z() << " mm" << RESTendl; + RESTMetadata << "-- Normal vector : X = " << fNormal.X() << " mm, " << " Y : " << fNormal.Y() + << " mm, Z : " << fNormal.Z() << " mm" << RESTendl; + RESTMetadata << "-- X-axis vector : X = " << fAxisX.X() << " mm, " << " Y : " << fAxisX.Y() + << " mm, Z : " << fAxisX.Z() << " mm" << RESTendl; RESTMetadata << "-- Y-axis vector : Y = " << fAxisY.X() << " mm, Y : " << fAxisY.Y() << " mm, Z : " << fAxisY.Z() << " mm" << RESTendl; RESTMetadata << "-- Cathode Position : X = " << GetCathodePosition().X() << " mm, " diff --git a/src/TRestDetectorSignal.cxx b/src/TRestDetectorSignal.cxx index 6e7a2f09..819b96a1 100644 --- a/src/TRestDetectorSignal.cxx +++ b/src/TRestDetectorSignal.cxx @@ -322,8 +322,7 @@ TRestDetectorSignal::GetMaxGauss() // returns a 2vector with the time of the pe time = -1; cout << endl << "WARNING: bad fit to signal with ID " << GetID() << " with maximum at time = " << maxRawTime - << " ns " - << "\n" + << " ns " << "\n" << "Failed fit parameters = " << gaus->GetParameter(0) << " || " << gaus->GetParameter(1) << " || " << gaus->GetParameter(2) << "\n" << "Assigned fit parameters : energy = " << energy << ", time = " << time << endl; @@ -377,8 +376,7 @@ TRestDetectorSignal::GetMaxLandau() // returns a 2vector with the time of the p time = -1; cout << endl << "WARNING: bad fit to signal with ID " << GetID() << " with maximum at time = " << maxRawTime - << " ns " - << "\n" + << " ns " << "\n" << "Failed fit parameters = " << landau->GetParameter(0) << " || " << landau->GetParameter(1) << " || " << landau->GetParameter(2) << "\n" << "Assigned fit parameters : energy = " << energy << ", time = " << time << endl; @@ -447,8 +445,7 @@ TRestDetectorSignal::GetMaxAget() // returns a 2vector with the time of the pea time = -1; cout << endl << "WARNING: bad fit to signal with ID " << GetID() << " with maximum at time = " << maxRawTime - << " ns " - << "\n" + << " ns " << "\n" << "Failed fit parameters = " << aget->GetParameter(0) << " || " << aget->GetParameter(1) << " || " << aget->GetParameter(2) << "\n" << "Assigned fit parameters : energy = " << energy << ", time = " << time << endl; diff --git a/src/TRestDetectorSignalViewerProcess.cxx b/src/TRestDetectorSignalViewerProcess.cxx index 3e47d28e..7b7c70ae 100644 --- a/src/TRestDetectorSignalViewerProcess.cxx +++ b/src/TRestDetectorSignalViewerProcess.cxx @@ -109,8 +109,7 @@ TRestEvent* TRestDetectorSignalViewerProcess::ProcessEvent(TRestEvent* inputEven } else if (a == 27) // esc { fDrawRefresh = 1e99; - while (getchar() != '\n') - ; + while (getchar() != '\n'); break; } else if (a == 110 || a == 78) // n { @@ -135,8 +134,7 @@ TRestEvent* TRestDetectorSignalViewerProcess::ProcessEvent(TRestEvent* inputEven RESTWarning << "cannot plot signal with id " << sgnCounter << RESTendl; } } - while (getchar() != '\n') - ; + while (getchar() != '\n'); } }