Skip to content

Small clean-up in TSpectrum* #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rvernica wants to merge 6 commits into from
Closed

Small clean-up in TSpectrum* #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86338ea
Remove unused SetResolution function and fResolution member.
rvernica Apr 5, 2016
119f6a4
Update broken links to the .ps files and add links to the manual.
rvernica Apr 5, 2016
33df022
Revert "Remove unused SetResolution function and fResolution member."
rvernica Jul 19, 2016
79e574a
Mark uses of fResolution, resolution, and SetResolution as *NOT USED*
rvernica Jul 19, 2016
9020f86
Merge remote-tracking branch 'upstream/master'
rvernica Jul 19, 2016
7b503f2
Add links to online documentation and tutorial to 2D and 3D spectrum …
rvernica Jul 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hist/spectrum/inc/TSpectrum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TSpectrum : public TNamed {
Double_t *fPosition; ///< [fNPeaks] array of current peak positions
Double_t *fPositionX; ///< [fNPeaks] X position of peaks
Double_t *fPositionY; ///< [fNPeaks] Y position of peaks
Double_t fResolution; ///< resolution of the neighboring peaks
Double_t fResolution; ///< *NOT USED* resolution of the neighboring peaks
TH1 *fHistogram; ///< resulting histogram
static Int_t fgAverageWindow; ///< Average window of searched peaks
static Int_t fgIterations; ///< Maximum number of decon iterations (default=3)
Expand All @@ -52,7 +52,7 @@ static Int_t fgIterations; ///< Maximum number of decon iterations (de
};

TSpectrum();
TSpectrum(Int_t maxpositions, Double_t resolution=1);
TSpectrum(Int_t maxpositions, Double_t resolution=1); // resolution is *NOT USED*
virtual ~TSpectrum();
virtual TH1 *Background(const TH1 *hist,Int_t niter=20, Option_t *option="");
TH1 *GetHistogram() const {return fHistogram;}
Expand All @@ -63,7 +63,7 @@ static Int_t fgIterations; ///< Maximum number of decon iterations (de
virtual Int_t Search(const TH1 *hist, Double_t sigma=2, Option_t *option="", Double_t threshold=0.05);
static void SetAverageWindow(Int_t w=3); //set average window
static void SetDeconIterations(Int_t n=3); //set max number of decon iterations
void SetResolution(Double_t resolution=1);
void SetResolution(Double_t resolution=1); // *NOT USED*

//new functions January 2006
const char *Background(Double_t *spectrum, Int_t ssize,Int_t numberIterations,Int_t direction, Int_t filterOrder,bool smoothing,Int_t smoothWindow,bool compton);
Expand Down
6 changes: 3 additions & 3 deletions hist/spectrum/inc/TSpectrum2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class TSpectrum2 : public TNamed {
Double_t *fPosition; ///< [fNPeaks] array of current peak positions
Double_t *fPositionX; ///< [fNPeaks] X position of peaks
Double_t *fPositionY; ///< [fNPeaks] Y position of peaks
Double_t fResolution; ///< resolution of the neighboring peaks
Double_t fResolution; ///< *NOT USED* resolution of the neighboring peaks
TH1 *fHistogram; ///< resulting histogram
static Int_t fgAverageWindow; ///< Average window of searched peaks
static Int_t fgIterations; ///< Maximum number of decon iterations (default=3)
Expand All @@ -38,7 +38,7 @@ static Int_t fgIterations; ///< Maximum number of decon iterations (def
};

TSpectrum2();
TSpectrum2(Int_t maxpositions, Double_t resolution=1);
TSpectrum2(Int_t maxpositions, Double_t resolution=1); // resolution is *NOT USED*
virtual ~TSpectrum2();
virtual TH1 *Background(const TH1 *hist, Int_t niter=20, Option_t *option="");
TH1 *GetHistogram() const {return fHistogram;}
Expand All @@ -49,7 +49,7 @@ static Int_t fgIterations; ///< Maximum number of decon iterations (def
virtual Int_t Search(const TH1 *hist, Double_t sigma=2, Option_t *option="", Double_t threshold=0.05);
static void SetAverageWindow(Int_t w=3); //set average window
static void SetDeconIterations(Int_t n=3); //set max number of decon iterations
void SetResolution(Double_t resolution=1);
void SetResolution(Double_t resolution=1); // *NOT USED*

//new functions January 2006
const char *Background(Double_t **spectrum,Int_t ssizex, Int_t ssizey,Int_t numberIterationsX,Int_t numberIterationsY,Int_t direction,Int_t filterType);
Expand Down
6 changes: 3 additions & 3 deletions hist/spectrum/inc/TSpectrum3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class TSpectrum3 : public TNamed {
Double_t *fPositionX; ///< [fNPeaks] X positions of peaks
Double_t *fPositionY; ///< [fNPeaks] Y positions of peaks
Double_t *fPositionZ; ///< [fNPeaks] Z positions of peaks
Double_t fResolution; ///< resolution of the neighboring peaks
Double_t fResolution; ///< *NOT USED* resolution of the neighboring peaks
TH1 *fHistogram; ///< resulting histogram

public:
Expand All @@ -37,7 +37,7 @@ class TSpectrum3 : public TNamed {
};

TSpectrum3();
TSpectrum3(Int_t maxpositions, Double_t resolution=1);
TSpectrum3(Int_t maxpositions, Double_t resolution=1); // resolution is *NOT USED*
virtual ~TSpectrum3();
virtual const char *Background(const TH1 *hist, Int_t niter, Option_t *option="goff");
const char *Background(Double_t ***spectrum, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t numberIterationsX,Int_t numberIterationsY, Int_t numberIterationsZ, Int_t direction,Int_t filterType);
Expand All @@ -51,7 +51,7 @@ class TSpectrum3 : public TNamed {
virtual Int_t Search(const TH1 *hist, Double_t sigma=2, Option_t *option="goff", Double_t threshold=0.05);
Int_t SearchFast(const Double_t ***source, Double_t ***dest, Int_t ssizex, Int_t ssizey, Int_t ssizez, Double_t sigma, Double_t threshold, Bool_t markov, Int_t averWindow);
Int_t SearchHighRes(const Double_t ***source,Double_t ***dest, Int_t ssizex, Int_t ssizey, Int_t ssizez, Double_t sigma, Double_t threshold, Bool_t backgroundRemove,Int_t deconIterations, Bool_t markov, Int_t averWindow);
void SetResolution(Double_t resolution=1);
void SetResolution(Double_t resolution=1); // *NOT USED*
const char *SmoothMarkov(Double_t ***source, Int_t ssizex, Int_t ssizey, Int_t ssizez, Int_t averWindow);

ClassDef(TSpectrum3,1) //Peak Finder, Background estimator, Markov smoothing and Deconvolution for 3-D histograms
Expand Down
18 changes: 13 additions & 5 deletions hist/spectrum/src/TSpectrum.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,17 @@

These NIM papers are also available as doc or ps files from:

- [Spectrum.doc](https://root.cern.ch/download/Spectrum.doc)
- [SpectrumDec.ps.gz](https://root.cern.ch/download/SpectrumDec.ps.gz)
- [SpectrumSrc.ps.gz](https://root.cern.ch/download/SpectrumSrc.ps.gz)
- [SpectrumBck.ps.gz](https://root.cern.ch/download/SpectrumBck.ps.gz)
- [SpectrumDec.ps.gz](ftp://root.cern.ch/download/SpectrumDec.ps.gz)
- [SpectrumSrc.ps.gz](ftp://root.cern.ch/download/SpectrumSrc.ps.gz)
- [SpectrumBck.ps.gz](ftp://root.cern.ch/download/SpectrumBck.ps.gz)

Manual:

- [Spectrum.doc](ftp://root.cern.ch/download/Spectrum.doc)
- [Spectrum.html](ftp://root.cern.ch/download/doc/spectrum/Spectrum.html)
- [Spectrum.pdf](ftp://root.cern.ch/download/doc/spectrum/Spectrum.pdf)
- [SpectrumLetter.pdf](ftp://root.cern.ch/download/doc/spectrum/SpectrumLetter.pdf)
- [Spectrum.epub](ftp://root.cern.ch/download/doc/spectrum/Spectrum.epub)

See also the
[online documentation](https://root.cern.ch/guides/tspectrum-manual) and
Expand Down Expand Up @@ -61,7 +68,7 @@ TSpectrum::TSpectrum() :TNamed("Spectrum", "Miroslav Morhac peak finder")

////////////////////////////////////////////////////////////////////////////////
/// - maxpositions: maximum number of peaks
/// - resolution: determines resolution of the neighbouring peaks
/// - resolution: *NOT USED* determines resolution of the neighbouring peaks
/// default value is 1 correspond to 3 sigma distance
/// between peaks. Higher values allow higher resolution
/// (smaller distance between peaks.
Expand Down Expand Up @@ -341,6 +348,7 @@ Int_t TSpectrum::Search(const TH1 * hin, Double_t sigma, Option_t * option,
}

////////////////////////////////////////////////////////////////////////////////
/// *NOT USED*
/// resolution: determines resolution of the neighbouring peaks
/// default value is 1 correspond to 3 sigma distance
/// between peaks. Higher values allow higher resolution
Expand Down
21 changes: 17 additions & 4 deletions hist/spectrum/src/TSpectrum2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,21 @@

These NIM papers are also available as doc or ps files from:

- [SpectrumDec.ps.gz](ftp://root.cern.ch/root/SpectrumDec.ps.gz)
- [SpectrumSrc.ps.gz](ftp://root.cern.ch/root/SpectrumSrc.ps.gz)
- [SpectrumBck.ps.gz](ftp://root.cern.ch/root/SpectrumBck.ps.gz)
- [SpectrumDec.ps.gz](ftp://root.cern.ch/download/SpectrumDec.ps.gz)
- [SpectrumSrc.ps.gz](ftp://root.cern.ch/download/SpectrumSrc.ps.gz)
- [SpectrumBck.ps.gz](ftp://root.cern.ch/download/SpectrumBck.ps.gz)

Manual:

- [Spectrum.doc](ftp://root.cern.ch/download/Spectrum.doc)
- [Spectrum.html](ftp://root.cern.ch/download/doc/spectrum/Spectrum.html)
- [Spectrum.pdf](ftp://root.cern.ch/download/doc/spectrum/Spectrum.pdf)
- [SpectrumLetter.pdf](ftp://root.cern.ch/download/doc/spectrum/SpectrumLetter.pdf)
- [Spectrum.epub](ftp://root.cern.ch/download/doc/spectrum/Spectrum.epub)

See also the
[online documentation](https://root.cern.ch/guides/tspectrum-manual) and
[tutorials](https://root.cern.ch/doc/master/group__tutorial__spectrum.html).

All the figures in this page were prepared using the DaqProVis
system, Data Acquisition, Processing and Visualization system,
Expand Down Expand Up @@ -64,7 +76,7 @@ TSpectrum2::TSpectrum2() :TNamed("Spectrum", "Miroslav Morhac peak finder")

////////////////////////////////////////////////////////////////////////////////
/// - maxpositions: maximum number of peaks
/// - resolution: determines resolution of the neighbouring peaks
/// - resolution: *NOT USED* determines resolution of the neighbouring peaks
/// default value is 1 correspond to 3 sigma distance
/// between peaks. Higher values allow higher resolution
/// (smaller distance between peaks.
Expand Down Expand Up @@ -273,6 +285,7 @@ Int_t TSpectrum2::Search(const TH1 * hin, Double_t sigma,
}

////////////////////////////////////////////////////////////////////////////////
/// *NOT USED*
/// resolution: determines resolution of the neighboring peaks
/// default value is 1 correspond to 3 sigma distance
/// between peaks. Higher values allow higher resolution
Expand Down
21 changes: 17 additions & 4 deletions hist/spectrum/src/TSpectrum3.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,21 @@

These NIM papers are also available as Postscript files from:

- [SpectrumDec.ps.gz](ftp://root.cern.ch/root/SpectrumDec.ps.gz)
- [SpectrumSrc.ps.gz](ftp://root.cern.ch/root/SpectrumSrc.ps.gz)
- [SpectrumBck.ps.gz](ftp://root.cern.ch/root/SpectrumBck.ps.gz)
- [SpectrumDec.ps.gz](ftp://root.cern.ch/download/SpectrumDec.ps.gz)
- [SpectrumSrc.ps.gz](ftp://root.cern.ch/download/SpectrumSrc.ps.gz)
- [SpectrumBck.ps.gz](ftp://root.cern.ch/download/SpectrumBck.ps.gz)

Manual:

- [Spectrum.doc](ftp://root.cern.ch/download/Spectrum.doc)
- [Spectrum.html](ftp://root.cern.ch/download/doc/spectrum/Spectrum.html)
- [Spectrum.pdf](ftp://root.cern.ch/download/doc/spectrum/Spectrum.pdf)
- [SpectrumLetter.pdf](ftp://root.cern.ch/download/doc/spectrum/SpectrumLetter.pdf)
- [Spectrum.epub](ftp://root.cern.ch/download/doc/spectrum/Spectrum.epub)

See also the
[online documentation](https://root.cern.ch/guides/tspectrum-manual) and
[tutorials](https://root.cern.ch/doc/master/group__tutorial__spectrum.html).
*/

#include "TSpectrum3.h"
Expand Down Expand Up @@ -67,7 +79,7 @@ TSpectrum3::TSpectrum3() :TNamed("Spectrum", "Miroslav Morhac peak finder")

////////////////////////////////////////////////////////////////////////////////
/// - maxpositions: maximum number of peaks
/// - resolution: determines resolution of the neighbouring peaks
/// - resolution: *NOT USED* determines resolution of the neighbouring peaks
/// default value is 1 correspond to 3 sigma distance
/// between peaks. Higher values allow higher resolution
/// (smaller distance between peaks.
Expand Down Expand Up @@ -213,6 +225,7 @@ Int_t TSpectrum3::Search(const TH1 * hin, Double_t sigma,


////////////////////////////////////////////////////////////////////////////////
/// *NOT USED*
/// resolution: determines resolution of the neighbouring peaks
/// default value is 1 correspond to 3 sigma distance
/// between peaks. Higher values allow higher resolution
Expand Down