diff --git a/examples/masks.rml b/examples/masks.rml index f562a7e27..2d86147b6 100644 --- a/examples/masks.rml +++ b/examples/masks.rml @@ -15,16 +15,15 @@ - - + - + - + diff --git a/source/framework/masks/inc/TRestRadialStrippedMask.h b/source/framework/masks/inc/TRestRadialStrippedMask.h index 3ffc731ea..b8d95caf2 100644 --- a/source/framework/masks/inc/TRestRadialStrippedMask.h +++ b/source/framework/masks/inc/TRestRadialStrippedMask.h @@ -31,7 +31,7 @@ class TRestRadialStrippedMask : public TRestPatternMask { void Initialize() override; /// The periodity of the stripped structure in radians - Double_t fStripsAngle = TMath::Pi()/3; //< + Double_t fStripsAngle = TMath::Pi() / 3; //< /// The width of the stripped structure in mm Double_t fStripsThickness = 0.5; //< diff --git a/source/framework/masks/src/TRestPatternMask.cxx b/source/framework/masks/src/TRestPatternMask.cxx index 4dca16fd9..5388888b3 100644 --- a/source/framework/masks/src/TRestPatternMask.cxx +++ b/source/framework/masks/src/TRestPatternMask.cxx @@ -228,8 +228,8 @@ TCanvas* TRestPatternMask::DrawMonteCarlo(Int_t nSamples) { } gridGraphs[0]->GetXaxis()->SetLimits(-1.25 * fMaskRadius, 1.25 * fMaskRadius); - gridGraphs[0]->GetHistogram()->SetMaximum(1.25 * fMaskRadius ); - gridGraphs[0]->GetHistogram()->SetMinimum(-1.25 * fMaskRadius ); + gridGraphs[0]->GetHistogram()->SetMaximum(1.25 * fMaskRadius); + gridGraphs[0]->GetHistogram()->SetMinimum(-1.25 * fMaskRadius); gridGraphs[0]->GetXaxis()->SetTitle("X [mm]"); gridGraphs[0]->GetXaxis()->SetTitleSize(0.04); diff --git a/source/framework/masks/src/TRestRadialStrippedMask.cxx b/source/framework/masks/src/TRestRadialStrippedMask.cxx index 12f9de7a5..00a44ed21 100644 --- a/source/framework/masks/src/TRestRadialStrippedMask.cxx +++ b/source/framework/masks/src/TRestRadialStrippedMask.cxx @@ -178,16 +178,15 @@ Int_t TRestRadialStrippedMask::GetRegion(Double_t& x, Double_t& y) { Int_t region = (Int_t) (phi/fStripsAngle); region = 2 + region%fMaxRegions; - Double_t angle = 0; - /// Checking if we hit an arm - while( angle < 2*TMath::Pi() ) - { - if( point.Y() < fStripsThickness/2. && point.Y() > -fStripsThickness/2. && point.X() >= 0 ) - return 0; - - point = point.Rotate(fStripsAngle); - angle += fStripsAngle; - } + Double_t angle = 0; + /// Checking if we hit an arm + while (angle < 2 * TMath::Pi()) { + if (point.Y() < fStripsThickness / 2. && point.Y() > -fStripsThickness / 2. && point.X() >= 0) + return 0; + + point = point.Rotate(fStripsAngle); + angle += fStripsAngle; + } return 1 + region % fModulus; } diff --git a/source/framework/sensitivity/inc/TRestSensitivity.h b/source/framework/sensitivity/inc/TRestSensitivity.h index f4e6e9deb..c60350f9e 100644 --- a/source/framework/sensitivity/inc/TRestSensitivity.h +++ b/source/framework/sensitivity/inc/TRestSensitivity.h @@ -41,7 +41,7 @@ class TRestSensitivity : public TRestMetadata { Bool_t fFrozen = false; //< Only needed if we add experiments by other means than RML /// It is used to generate a histogram with the signal distribution produced with different signal samples - TH1D* fSignalTest = nullptr; //< + TH1D* fSignalTest = nullptr; //< /// A canvas to draw TCanvas* fCanvas = nullptr; //! @@ -69,7 +69,7 @@ class TRestSensitivity : public TRestMetadata { std::vector GetAveragedCurve(); std::vector> GetLevelCurves(const std::vector& levels); - void ExportCurve(std::string fname, Double_t factor = 1.e-10, Double_t power = 0.25, int n = 0); + void ExportCurve(std::string fname, Double_t factor = 1.e-10, Double_t power = 0.25, int n = 0); void ExportAveragedCurve(std::string fname, Double_t factor = 1.e-10, Double_t power = 0.25); TH1D* SignalStatisticalTest(Double_t node, Int_t N);