fIntegralRange is now fAnalysisRange

pipeline/pandaxiii_MC/processes_2D.rml

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <processes>
     <TRestDetectorElectronDiffusionProcess name="eDiff_1kVcm_10atm" title="eDiff" verboseLevel="silent">
         <parameter name="electricField" value="1" units="kV/cm"/>
@@ -10,25 +10,18 @@
         <!--<observable name="readoutPlaneEnergy_1" value="ON" /> -->
         <!-- There is no need to specify additional parameters if all values will be taken from the gas properties (TRestDetectorGas). -->
     </TRestDetectorElectronDiffusionProcess>
-
-    <TRestDetectorAvalancheProcess name="avalancheProcess" title="IAXOD0 chamber">
-        <parameter name="energyReference" value="5.9keV"/>
-        <parameter name="resolutionReference" value="13"/>// fwhm
-        <parameter name="detectorGain" value="8000"/>// absolute gain // parameter name=&quot;electronicsGain&quot;
-        value=&quot;671744&quot; // electrons for 4096 ADC units
+    <TRestDetectorAvalancheProcess name="avalancheProcess" title="IAXOD0 chamber"><parameter name="energyReference" value="5.9keV"/><parameter name="resolutionReference" value="13"/>// fwhm
+        <parameter name="detectorGain" value="8000"/>// absolute gain // parameter name="electronicsGain"
+        value="671744" // electrons for 4096 ADC units
     </TRestDetectorAvalancheProcess>
-
     <TRestDetectorSignalDeconvolutionProcess name="deconvolution-Template" title="Deconvolution of AGET signals">
         <parameter name="transversalDiffusionCoefficient" value="10"/>
         <!-- There is no need to specify additional parameters if all values will be taken from the gas properties (TRestDetectorGas). -->
     </TRestDetectorSignalDeconvolutionProcess>
-    <TRestDetectorAvalancheProcess name="avalancheProcess" title="IAXOD0 chamber">
-        <parameter name="energyReference" value="5.9keV"/>
-        <parameter name="resolutionReference" value="13"/>// fwhm
-        <parameter name="detectorGain" value="8000"/>// absolute gain // parameter name=&quot;electronicsGain&quot;
-        value=&quot;671744&quot; // electrons for 4096 ADC units
+    <TRestDetectorAvalancheProcess name="avalancheProcess" title="IAXOD0 chamber"><parameter name="energyReference" value="5.9keV"/><parameter name="resolutionReference" value="13"/>// fwhm
+        <parameter name="detectorGain" value="8000"/>// absolute gain // parameter name="electronicsGain"
+        value="671744" // electrons for 4096 ADC units
     </TRestDetectorAvalancheProcess>
-
     <TRestDetectorSignalDeconvolutionProcess name="deconv" title="Deconvolution of AGET signals" verboseLevel="silent">
         <parameter name="frequency1" value="2.71383005928202273"/>
         <parameter name="frequency2" value="18.6067876433914706e"/>
@@ -41,18 +34,11 @@
         <parameter name="cutFrequency" value="12"/>
         <parameter name="responseFile" value="AGET_Response_SJTU_2017Feb22.root"/>
     </TRestDetectorSignalDeconvolutionProcess>
-
-    <TRestDetectorSignalGaussianConvolutionProcess name="gConv" title="Gaussian convolution of signals">
-        <parameter name="sigma" value=".1us"/>
-        <parameter name="nSigmas" value="2"/>// Number of sigmas to perform the calculation
+    <TRestDetectorSignalGaussianConvolutionProcess name="gConv" title="Gaussian convolution of signals"><parameter name="sigma" value=".1us"/><parameter name="nSigmas" value="2"/>// Number of sigmas to perform the calculation
     </TRestDetectorSignalGaussianConvolutionProcess>
-
-    <TRestAddSignalNoiseProcess name="addSignalNoiseProcess" title="Test AddNoise to Signal">
-        <parameter name="noiseLevel" value="5"/>// // electrons in each time bin
+    <TRestAddSignalNoiseProcess name="addSignalNoiseProcess" title="Test AddNoise to Signal"><parameter name="noiseLevel" value="5"/>// // electrons in each time bin
     </TRestAddSignalNoiseProcess>
-
-    <TRestDetectorSignalToHitsProcess name="signalToHits" title="A Signal To Hits reconstruction template."
-                                      verboseLevel="silent">
+    <TRestDetectorSignalToHitsProcess name="signalToHits" title="A Signal To Hits reconstruction template." verboseLevel="silent">
         <parameter name="sampling" value="200ns"/>
         <parameter name="electricField" value="1000" units="V/cm"/>
         <!-- If not specified, the following values will be taken from TRestDetectorGas properties -->
@@ -62,15 +48,13 @@
         <!-- in cm/us -->
         <parameter name="method" value="all"/>
     </TRestDetectorSignalToHitsProcess>
-
     <TRestDetectorHitsToSignalProcess name="hitsToSignal" title="A hits to signal template" verboseLevel="silent">
         <parameter name="sampling" value="200ns"/>
         <parameter name="electricField" value="1000" units="V/cm"/>
         <!-- If specified, the following parameters will modify the properties of the gas found in TRestDetectorGas -->
         <parameter name="gasPressure" value=""/>
         <parameter name="driftVelocity" value=""/>
     </TRestDetectorHitsToSignalProcess>
-
     <TRestDetectorHitsToTrackProcess name="ihitsToTrack" title="">
         <parameter name="clusterDistance" value="7.5" units="mm"/>
     </TRestDetectorHitsToTrackProcess>
@@ -88,8 +72,7 @@
         <parameter name="distanceStepFactor" value="1.15"/>
         <parameter name="maxNodes" value="25"/>
     </TRestDetectorHitsReductionProcess>
-    <TRestTrackReductionProcess name="trackReduction" title="Merges the closer hits in a TrackEvent"
-                                verboseLevel="silent">
+    <TRestTrackReductionProcess name="trackReduction" title="Merges the closer hits in a TrackEvent" verboseLevel="silent">
         <parameter name="startingDistance" value="0.15mm"/>
         <parameter name="minimumDistance" value="0.5mm"/>
         <parameter name="distanceStepFactor" value="1.15"/>
@@ -112,12 +95,9 @@
         <observable name="GasVolumeEDep" value="ON" description="Energy deposited in the gas volume in keV"/>
         <observable name="vesselVolumeEDep" value="OFF" description="Energy deposited in the vessel volume in keV"/>
         <observable name="totalEdep" value="ON" description="Total energy deposited in all the volumes in keV"/>
-        <observable name="photoelectric" value="ON" type="int"
-                    description="Its value will be 1 if the event contains a photoelectric interaction."/>
-        <observable name="compton" value="ON" type="int"
-                    description="Its value will be 1 if the event contains a compton scattering process."/>
-        <observable name="bremstralung" value="ON" type="int"
-                    description="Its value will be 1 if the event contains a bremstralung physics process."/>
+        <observable name="photoelectric" value="ON" type="int" description="Its value will be 1 if the event contains a photoelectric interaction."/>
+        <observable name="compton" value="ON" type="int" description="Its value will be 1 if the event contains a compton scattering process."/>
+        <observable name="bremstralung" value="ON" type="int" description="Its value will be 1 if the event contains a bremstralung physics process."/>
         <parameter name="lowEnergyCut" value="600keV"/>
         <parameter name="highEnergyCut" value="3000keV"/>
     </TRestGeant4AnalysisProcess>
@@ -198,14 +178,10 @@
         <parameter name="normFactor" value="0.021917"/>
     </TRestDetectorHitsNormalizationProcess>
     <TRestTrackAnalysisProcess name="tckAna" title="Track analysis template">
-        <observable name="nTracksXYZ" type="int" value="ON"
-                    description="Number of pure 3D-tracks (with valid XYZ-hits)."/>
-        <observable name="nTrackEnergyRatio" value="ON"
-                    description="Energy ratio between track event energy excluding the main track and total track event energy."/>
-        <observable name="nTracks_HE_100" type="int" value="ON"
-                    description="Number of tracks with energy higher than 100 keV."/>
-        <observable name="nTracks_LE_100" type="int" value="ON"
-                    description="Number of tracks with energy lower than 100 keV."/>
+        <observable name="nTracksXYZ" type="int" value="ON" description="Number of pure 3D-tracks (with valid XYZ-hits)."/>
+        <observable name="nTrackEnergyRatio" value="ON" description="Energy ratio between track event energy excluding the main track and total track event energy."/>
+        <observable name="nTracks_HE_100" type="int" value="ON" description="Number of tracks with energy higher than 100 keV."/>
+        <observable name="nTracks_LE_100" type="int" value="ON" description="Number of tracks with energy lower than 100 keV."/>
         <observable name="SecondMaxTrackEnergy" value="ON" description="The energy of the second most energetic track"/>
         <observable name="xMean" value="ON"/>
         <observable name="yMean" value="ON"/>
@@ -214,8 +190,7 @@
     <TRestTrackAnalysisProcess name="tckAna_2" title="Track analysis template">
         <observable name="nTracks_X" type="int" value="ON" description="Number of 2D-tracks (with valid XZ-hits)."/>
         <observable name="nTracks_Y" type="int" value="ON" description="Number of 2D-tracks (with valid YZ-hits)."/>
-        <observable name="nTrackEnergyRatio" value="ON"
-                    description="Energy ratio between track event energy excluding the main track and total track event energy."/>
+        <observable name="nTrackEnergyRatio" value="ON" description="Energy ratio between track event energy excluding the main track and total track event energy."/>
     </TRestTrackAnalysisProcess>
     <TRestTrackAnalysisProcess name="tckVol_2D" title="Track analysis template">
         <observable name="MaxTrackVolume_X" value="ON" description=""/>
@@ -227,14 +202,11 @@
         <observable name="zMean" value="ON"/>
         <observable name="nTracks_X" type="int" value="ON" description="Number of 2D-tracks (with valid XZ-hits)."/>
         <observable name="nTracks_Y" type="int" value="ON" description="Number of 2D-tracks (with valid YZ-hits)."/>
-        <observable name="MaxTrackEnergyRatio" value="ON"
-                    description="Energy ratio between secondary tracks and main track."/>
+        <observable name="MaxTrackEnergyRatio" value="ON" description="Energy ratio between secondary tracks and main track."/>
         <observable name="MaxTrackLength_X" value="ON" description=""/>
         <observable name="MaxTrackLength_Y" value="ON" description=""/>
-        <observable name="SecondMaxTrackEnergy_X" value="ON"
-                    description="The energy of the second most energetic track in X"/>
-        <observable name="SecondMaxTrackEnergy_Y" value="ON"
-                    description="The energy of the second most energetic track in Y"/>
+        <observable name="SecondMaxTrackEnergy_X" value="ON" description="The energy of the second most energetic track in X"/>
+        <observable name="SecondMaxTrackEnergy_Y" value="ON" description="The energy of the second most energetic track in Y"/>
         <observable name="MaxTrackVolume_X" value="ON" description=""/>
         <observable name="MaxTrackVolume_Y" value="ON" description=""/>
         <parameter name="enableTwistParameters" value="true"/>
@@ -474,7 +446,7 @@
         <!-- This parameter is used to define the baseline calculation -->
         <parameter name="baseLineRange" value="(50,120)"/>
         <!-- This parameter is used to define the signal integration window -->
-        <parameter name="integralRange" value="(40,472)"/>
+        <parameter name="analysisRange" value="(40,472)"/>
         <!-- These parameters define the integral with threshold.
          threshold : number of baseline noise sigmas to consider a point for integration.
          pointsOverThreshold : Number of consecutive points over threshold to be considered for integration.
@@ -509,8 +481,7 @@
         <parameter name="resolutionReference" value="1"/>
         <parameter name="detectorGain" value="1"/>
     </TRestDetectorAvalancheProcess>
-    <TRestDetectorSignalShapingProcess name="signalShapingProcess" title="Test SignalShaping">
-        <parameter name="responseFile" value="AGET_Response_12.5MHz_Gain0x1_Shaping0x4.root"/>//response file to be used
+    <TRestDetectorSignalShapingProcess name="signalShapingProcess" title="Test SignalShaping"><parameter name="responseFile" value="AGET_Response_12.5MHz_Gain0x1_Shaping0x4.root"/>//response file to be used
         to shape the signal
     </TRestDetectorSignalShapingProcess>
     <TRestGeant4ToDetectorHitsProcess name="G4ToHits" title="G4Hits to Hits process"/>

pipeline/trex/01_raw.rml

@@ -38,7 +38,7 @@
 		</addProcess>
 
 		<addProcess type="TRestRawSignalAnalysisProcess" name="rawAna" value="ON"
-			baseLineRange="(${BL_MIN},${BL_MAX})" integralRange="(${INT_MIN},${INT_MAX})"
+			baseLineRange="(${BL_MIN},${BL_MAX})" analysisRange="(${INT_MIN},${INT_MAX})"
 			pointThreshold="${POINT_TH}" pointsOverThreshold="${NPOINTS}" signalThreshold="${SGNL_TH}"
 			verboseLevel="silent" >
             // We define all observables except MinValue because is not yet on validation.root

pipeline/trex/02_signal.rml

@@ -1,38 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TRestManager>
-
-	<globals file="globals.xml"/>
-	<globals>
-	    <variable name="RUN_TYPE" value="Signals" overwrite="false" />
-	</globals>
-
-	<TRestRun file="run.xml" />
-
-	<TRestProcessRunner name="Signals" title="REST Manager. Raw To Track Analysis (analysis without intermediate output)." verboseLevel="silent">
-
-		<parameter name="eventsToProcess" value="0" />
-
-		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="ON"
-		       threshold="0.01"
-		       triggerStarts="0us"
-		       gain="1"
-		       zeroSuppression="true"
-		       baseLineRange="(${BL_MIN},${BL_MAX})"
-		       integralRange="(${INT_MIN},${INT_MAX})"
-		       pointThreshold="${POINT_TH}"
-		       nPointsOverThreshold="${NPOINTS}"
-		       sampling="${SAMPLING}"
-		       signalThreshold="${SGNL_TH}"
-		       verboseLevel="silent" />
-
-		<addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="ON" verboseLevel="info" observable="all" >
-		    <parameter name="daqChannels" value="72*4*4" />
-		    <parameter name="readoutChannels" value="256*2*2" />
-		</addProcess>
-
-	</TRestProcessRunner>
-
-	<addTask type="processEvents" value="ON" />
-
+    <globals file="globals.xml"/>
+    <globals>
+        <variable name="RUN_TYPE" value="Signals" overwrite="false"/>
+    </globals>
+    <TRestRun file="run.xml"/>
+    <TRestProcessRunner name="Signals" title="REST Manager. Raw To Track Analysis (analysis without intermediate output)." verboseLevel="silent">
+        <parameter name="eventsToProcess" value="0"/>
+        <addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="ON" threshold="0.01" triggerStarts="0us" gain="1" zeroSuppression="true" baseLineRange="(${BL_MIN},${BL_MAX})" analysisRange="(${INT_MIN},${INT_MAX})" pointThreshold="${POINT_TH}" nPointsOverThreshold="${NPOINTS}" sampling="${SAMPLING}" signalThreshold="${SGNL_TH}" verboseLevel="silent"/>
+        <addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="ON" verboseLevel="info" observable="all">
+            <parameter name="daqChannels" value="72*4*4"/>
+            <parameter name="readoutChannels" value="256*2*2"/>
+        </addProcess>
+    </TRestProcessRunner>
+    <addTask type="processEvents" value="ON"/>
 </TRestManager>

source/framework/CMakeLists.txt

@@ -4,7 +4,7 @@ link_libraries("-fPIC")
 
 add_subdirectory(external)
 
-set(contents external/tinyxml tools core analysis masks)
+set(contents external/tinyxml tools core analysis masks sensitivity)
 
 file(GLOB_RECURSE addon_src "tiny*cpp" "startup.cpp")
 

source/framework/core/inc/TRestDataSet.h

@@ -129,8 +129,8 @@ class TRestDataSet : public TRestMetadata {
     TTree* GetTree() const {
         if (fTree == nullptr) {
             RESTError << "Tree has not been yet initialized" << RESTendl;
-            RESTError << "You should invoke TRestDataSet::GenerateDataSet() before trying to access the tree"
-                      << RESTendl;
+            RESTError << "You should invoke TRestDataSet::GenerateDataSet() or " << RESTendl;
+            RESTError << "TRestDataSet::Import( fname ) before trying to access the tree" << RESTendl;
         }
         return fTree;
     }

source/framework/core/src/startup.cpp

@@ -288,7 +288,8 @@ vector<T> StringToVector(string vec) {
         }
 
     } else {
-        cout << "illegal format!" << endl;
+        cout << "Startup. StringToVector. Illegal format!" << endl;
+        cout << "A vector should be defined using brackets and comma separated elements: {a,b,c,d}" << endl;
         return vector<T>{};
     }