diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index e1f143143..7a457c245 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -628,7 +628,7 @@ jobs:
           retention-days: 1
 
   rawlib-validation:
-    uses: rest-for-physics/rawlib/.github/workflows/validation.yml@master
+    uses: rest-for-physics/rawlib/.github/workflows/validation.yml@jgalan-raw-analysis
 
   geant4lib-validation:
     uses: rest-for-physics/geant4lib/.github/workflows/validation.yml@master
diff --git a/examples/01.alphaTrack/processing.rml b/examples/01.alphaTrack/processing.rml
index d8b32a92d..5e19f5eab 100644
--- a/examples/01.alphaTrack/processing.rml
+++ b/examples/01.alphaTrack/processing.rml
@@ -1,22 +1,13 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <TRestManager name="RESTManagerSim" title="Template manager to process a simulation generated by restG4.">
-
-    <globals>
-        <variable name="EXPERIMENT" value="Fluorescence" overwrite="false"/>
-		<variable name="RAW_PROCESSING" value="OFF" />
-		<variable name="HIT_PROCESSING" value="OFF" />
-		<variable name="TRACK_PROCESSING" value="OFF" />
-		<variable name="SHAPING" value="OFF" />
-        <parameter name="mainDataPath" value="."/>
-        <parameter name="verboseLevel" value="warning"/>
+    <globals><variable name="EXPERIMENT" value="Fluorescence" overwrite="false"/><variable name="RAW_PROCESSING" value="OFF"/><variable name="HIT_PROCESSING" value="OFF"/><variable name="TRACK_PROCESSING" value="OFF"/><variable name="SHAPING" value="OFF"/><parameter name="mainDataPath" value="."/><parameter name="verboseLevel" value="warning"/>
         %options are : essential silent, warning, info, debug
 
-		<parameter name="sampling" value="10ns" />
-		<parameter name="driftVelocity" value="" />
-		<parameter name="electricField" value="100" units="V/cm" />
-		<parameter name="gasPressure" value="1" />
+		<parameter name="sampling" value="10ns"/>
+		<parameter name="driftVelocity" value=""/>
+		<parameter name="electricField" value="100" units="V/cm"/>
+		<parameter name="gasPressure" value="1"/>
     </globals>
-
     <TRestRun name="Process" title="Alpha simulations.">
         <parameter name="experimentName" value="${EXPERIMENT}"/>
         <parameter name="readOnly" value="false"/>
@@ -27,90 +18,37 @@
         <parameter name="user" value="${USER}"/>
         <parameter name="verboseLevel" value="1"/>
         <parameter name="overwrite" value="off"/>
-		<parameter name="outputFileName" value="data/Response_[fRunTag].root" />
-
-		<addMetadata type="TRestDetectorReadout" name="cathode" file="readout/readouts.root" store="false" />
-		<TRestDetectorGas name="Argon-Isobutane 1Pct 10-10E3Vcm" pressure="1" file="server" />
+        <parameter name="outputFileName" value="data/Response_[fRunTag].root"/>
+        <addMetadata type="TRestDetectorReadout" name="cathode" file="readout/readouts.root" store="false"/>
+        <TRestDetectorGas name="Argon-Isobutane 1Pct 10-10E3Vcm" pressure="1" file="server"/>
     </TRestRun>
+    <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info"><parameter name="eventsToProcess" value="0"/><parameter name="threadNumber" value="1"/><parameter name="inputAnalysisStorage" value="on"/><parameter name="inputEventStorage" value="off"/><parameter name="outputEventStorage" value="on"/>
 
+        // observable = all will add all NON `custom` observables
+        <addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON"><observable name="thetaPrimary" value="ON"/><observable name="phiPrimary" value="ON"/><observable name="xOriginPrimary" value="ON"/><observable name="yOriginPrimary" value="ON"/><observable name="zOriginPrimary" value="ON"/><observable name="xDirectionPrimary" value="ON"/><observable name="yDirectionPrimary" value="ON"/><observable name="zDirectionPrimary" value="ON"/><observable name="totalEdep" value="ON"/></addProcess>
 
-    <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
-        <parameter name="eventsToProcess" value="0"/>
-        <parameter name="threadNumber" value="1"/>
+		<addProcess type="TRestGeant4ToDetectorHitsProcess" name="G4ToHits" value="ON"/>
 
-        <parameter name="inputAnalysisStorage" value="on"/>
-        <parameter name="inputEventStorage" value="off"/>
-        <parameter name="outputEventStorage" value="on"/>
+		<addProcess type="TRestDetectorElectronDiffusionProcess" name="eDiff" value="ON"><parameter name="attachment" value="0"/><parameter name="Wvalue" value="" units="eV"/><parameter name="maxHits" value="2000"/></addProcess>
 
-        // observable = all will add all NON `custom` observables
-        <addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON">
-			<observable name="thetaPrimary" value="ON" />
-			<observable name="phiPrimary" value="ON" />
-			<observable name="xOriginPrimary" value="ON" />
-			<observable name="yOriginPrimary" value="ON" />
-			<observable name="zOriginPrimary" value="ON" />
-			<observable name="xDirectionPrimary" value="ON" />
-			<observable name="yDirectionPrimary" value="ON" />
-			<observable name="zDirectionPrimary" value="ON" />
-			<observable name="totalEdep" value="ON" />
-        </addProcess>
-
-		<addProcess type="TRestGeant4ToDetectorHitsProcess" name="G4ToHits" value="ON" />
-
-		<addProcess type="TRestDetectorElectronDiffusionProcess" name="eDiff" value="ON" >
-			<parameter name="attachment" value="0" />
-			<parameter name="Wvalue" value="" units="eV" />
-			<parameter name="maxHits" value="2000" />
-		</addProcess>
-
-		<addProcess type="TRestDetectorHitsSmearingProcess" name="smear" title="Smearing template">
-			<parameter name="energyReference" value="6keV" />
-			<parameter name="resolutionReference" value="13" />
-		</addProcess>
+		<addProcess type="TRestDetectorHitsSmearingProcess" name="smear" title="Smearing template"><parameter name="energyReference" value="6keV"/><parameter name="resolutionReference" value="13"/></addProcess>
 
 		<addProcess type="TRestDetectorFiducializationProcess" name="fidutialization" title="Readout fiducialization"/>
 
-		<addProcess type="TRestDetectorHitsAnalysisProcess" name="hitsAnaDiff" title="A hits analysis process">
-			<observable name="energy" value="ON" />
-			<observable name="xMean" value="ON" />
-			<observable name="yMean" value="ON" />
-			<observable name="zMean" value="ON" />
-		</addProcess>
+		<addProcess type="TRestDetectorHitsAnalysisProcess" name="hitsAnaDiff" title="A hits analysis process"><observable name="energy" value="ON"/><observable name="xMean" value="ON"/><observable name="yMean" value="ON"/><observable name="zMean" value="ON"/></addProcess>
 
-		<addProcess type="TRestDetectorHitsToSignalProcess" name="hitsToSignal" title="A hits to signal template" value="${HIT_PROCESSING}" >
-			<parameter name="driftVelocity" value="" />
-		</addProcess>
+		<addProcess type="TRestDetectorHitsToSignalProcess" name="hitsToSignal" title="A hits to signal template" value="${HIT_PROCESSING}"><parameter name="driftVelocity" value=""/></addProcess>
 
-		<addProcess type="TRestDetectorSignalToRawSignalProcess" name="signalToRaw" title="Physical signal to raw signal" value="${RAW_PROCESSING}">
-			<parameter name="Npoints" value="512" />
-			<parameter name="triggerMode" value="firstDeposit" />
-			<parameter name="triggerDelay" value="120" />
-			<parameter name="gain" value="10" />
-		</addProcess>
+		<addProcess type="TRestDetectorSignalToRawSignalProcess" name="signalToRaw" title="Physical signal to raw signal" value="${RAW_PROCESSING}"><parameter name="Npoints" value="512"/><parameter name="triggerMode" value="firstDeposit"/><parameter name="triggerDelay" value="120"/><parameter name="gain" value="10"/></addProcess>
 
-		<addProcess type="TRestRawSignalShapingProcess" name="shaping" title="Signal shaping" value="${SHAPING}">
-			<parameter name="shapingType" value="shaperSin" />
-			<parameter name="shapingTime" value="10" />
-			<parameter name="gain" value="1" />
-		</addProcess>
+		<addProcess type="TRestRawSignalShapingProcess" name="shaping" title="Signal shaping" value="${SHAPING}"><parameter name="shapingType" value="shaperSin"/><parameter name="shapingTime" value="10"/><parameter name="gain" value="1"/></addProcess>
 
-		<addProcess type="TRestRawSignalAddNoiseProcess" name="noise" title="Signal noise" value="${RAW_PROCESSING}">
-			<parameter name="noiseLevel" value="2" />
-		</addProcess>
+		<addProcess type="TRestRawSignalAddNoiseProcess" name="noise" title="Signal noise" value="${RAW_PROCESSING}"><parameter name="noiseLevel" value="2"/></addProcess>
 
 		<addProcess type="TRestRawSignalAnalysisProcess" name="rawAna" title="Signal noise" value="${RAW_PROCESSING}" observable="all">
 		</addProcess>
 
-		<addProcess type="TRestRawToDetectorSignalProcess" name="zS" value="${RAW_PROCESSING}"
-                  triggerStarts="0us"
-                  gain="1"
-                  threshold="0.01"
-                  zeroSuppression="true"
-		  baseLineRange="(5,55)"
-		  integralRange="(10,500)"
-		  pointThreshold="2"
-		  nPointsOverThreshold="5"
-		  signalThreshold="3" />
+		<addProcess type="TRestRawToDetectorSignalProcess" name="zS" value="${RAW_PROCESSING}" triggerStarts="0us" gain="1" threshold="0.01" zeroSuppression="true" baseLineRange="(5,55)" analysisRange="(10,500)" pointThreshold="2" nPointsOverThreshold="5" signalThreshold="3"/>
 
 			<!-- Requires a bit of debugging
 		<addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="${RAW_PROCESSING}" verboseLevel="info" observable="all" >
@@ -119,28 +57,14 @@
 		</addProcess>
 			-->
 
-		<addProcess type="TRestDetectorSignalToHitsProcess" name="signalToHits" value="${HIT_PROCESSING}"
-			observable="all" method="all" />
+		<addProcess type="TRestDetectorSignalToHitsProcess" name="signalToHits" value="${HIT_PROCESSING}" observable="all" method="all"/>
 
-                <addProcess type="TRestDetectorHitsToTrackFastProcess" name="hitsToTrackFast" title="" value="OFF">
-                       <parameter name="netOrigin" value="(-100,-100,-100)" units="mm" />
-                       <parameter name="netSize" value="200" units="mm" />
-                       <parameter name="cellResolution" value="2" units="mm" />
-                </addProcess>
+                <addProcess type="TRestDetectorHitsToTrackFastProcess" name="hitsToTrackFast" title="" value="OFF"><parameter name="netOrigin" value="(-100,-100,-100)" units="mm"/><parameter name="netSize" value="200" units="mm"/><parameter name="cellResolution" value="2" units="mm"/></addProcess>
 
-		<addProcess type="TRestDetectorHitsToTrackProcess" name="hitsToTrack" title="" value="${TRACK_PROCESSING}">
-			<parameter name="clusterDistance" value="1" units="cm" />
-		</addProcess>
+		<addProcess type="TRestDetectorHitsToTrackProcess" name="hitsToTrack" title="" value="${TRACK_PROCESSING}"><parameter name="clusterDistance" value="1" units="cm"/></addProcess>
 
-		<addProcess type="TRestTrackReductionProcess" name="reduction" title="" value="${TRACK_PROCESSING}">
-			<parameter name="startingDistance" value="0.15mm" />
-			<parameter name="minimumDistance" value="0.5mm" />
-			<parameter name="distanceStepFactor" value="1.15" />
-			<parameter name="maxNodes" value="3" />
-		</addProcess>
+		<addProcess type="TRestTrackReductionProcess" name="reduction" title="" value="${TRACK_PROCESSING}"><parameter name="startingDistance" value="0.15mm"/><parameter name="minimumDistance" value="0.5mm"/><parameter name="distanceStepFactor" value="1.15"/><parameter name="maxNodes" value="3"/></addProcess>
 
     </TRestProcessRunner>
-
     <addTask type="processEvents" value="ON"/>
-
 </TRestManager>
diff --git a/pipeline/pandaxiii_MC/processes_2D.rml b/pipeline/pandaxiii_MC/processes_2D.rml
index aa6aa3cb0..a768f658d 100644
--- a/pipeline/pandaxiii_MC/processes_2D.rml
+++ b/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,7 +48,6 @@
         <!-- 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"/>
@@ -70,7 +55,6 @@
         <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"/>
diff --git a/pipeline/trex/01_raw.rml b/pipeline/trex/01_raw.rml
index 0cc941894..b12051a72 100644
--- a/pipeline/trex/01_raw.rml
+++ b/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
diff --git a/pipeline/trex/02_signal.rml b/pipeline/trex/02_signal.rml
index 5cc368607..d4f369a12 100644
--- a/pipeline/trex/02_signal.rml
+++ b/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>