Closed benkrikler closed 10 years ago
I'm going to merge this in.
Just to be very clear though, there were changes to the default values of source IDs and for how we create channel IDs from a string with a fast/slow wild-card.
This has been merged in
This is to merge in the code I added to get the integral ratio working for pile-up. I had to make some changes to common files so I'm going to merge through a pull request, including in the I(nfamous)D classes.
Here's my summary of changes:
Algorithm::SimpInt
- add integral limits, defaults use full waveform range as before. Also changed implementation to usestd::accumulate
. Pedestal is not a constant, but can only be accessed through getters and setters.Algorithm::IntegralRatio
- Implements the integral ratio algorithm using the SimpInt algorithm behind the scenes.GetDirectory(const char*)
method toBaseModule
. It gets or else creates a sub-directory of the modules' directory, in case a module makes many plots and wants to provide better structure (such as a directory per source for example) in the output file.IDs::source
constructors with 4 arguments was changed so that if no value for the 4th argument is specified (giving the configuration of a generator) the generator is created with thekDefaultConfig
value. This is the same as for generators but may break existing code since it was previously givingkAnyConfig
.IDs::channel
the two possible strings to specify channels that are either fast or slow is now either-*
orany
as opposed to*
orany
. This matches the string used for assignment from a string.