From db0391452d33a11f1c38c9dd90592ef35b1a4ee9 Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 11:44:17 +0100
Subject: [PATCH 01/31] Adding 01.alphaTrack validation routine

---
 .gitlab-ci.yml                    | 29 +++++++++++++++++++++++++++++
 examples/01.alphaTrack/Validate.C | 11 +++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 examples/01.alphaTrack/Validate.C

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e40a2295..9f5aa52bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,9 @@ stages:
     # Stage to validate restG4 package examples
   - restG4
 
+    # Stage to validate framework examples
+  - examples
+
     # Stage to validate data chain processing constructions (TREX-DM data, PandaX-III topology, etc).
   - restManager_process
 
@@ -201,6 +204,32 @@ listRESTMacros:
       - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/Xe136bb0n_n2E06.root
     expire_in: 1 day
 
+08_alphas:
+  type: restG4
+  script:
+    - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
+    - cd ${CI_PROJECT_DIR}/install_latest/examples/restG4/08.Alphas/
+    - mkdir data
+    - export REST_ENERGY=5
+    - export REST_FOIL=1
+    - restG4 alphas.rml
+  artifacts:
+    paths:
+      - ${CI_PROJECT_DIR}/install_latest/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
+    expire_in: 1 day
+
+01_alphaTrack:
+    type: examples
+    script:
+    - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
+    - cd ${CI_PROJECT_DIR}/install_latest/examples/restG4/01.alphaTrack/
+    - export RAW_PROCESSING=ON
+    - export HIT_PROCESSING=ON
+    - export TRACK_PROCESSING=ON
+    - mkdir data
+    - restManager --c processing.rml --f ${CI_PROJECT_DIR}/install_latest/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
+    - restRoot -b -q Validate.C'("data/Response_5MeV_1um.root")'
+
 LoadGas:
   type: metadata 
   script:
diff --git a/examples/01.alphaTrack/Validate.C b/examples/01.alphaTrack/Validate.C
new file mode 100644
index 000000000..6d9611ae1
--- /dev/null
+++ b/examples/01.alphaTrack/Validate.C
@@ -0,0 +1,11 @@
+Int_t Validate(string fname) {
+    TRestRun* run = new TRestRun(fname);
+    if (run->GetEntries() != 4424) {
+        cout << "The number of entries is not 4424!" << endl;
+        return 1;
+    }
+    delete run;
+
+    cout << "[\033[92m OK \x1b[0m]" << endl;
+    return 0;
+}

From dd4e3744d95abc99e68b937dc3adc408f6a0164d Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 11:54:32 +0100
Subject: [PATCH 02/31] Pipeline/trexdm Removing forking feature from pipeline

---
 .gitlab-ci.yml | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f5aa52bf..be59b1b55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -295,28 +295,17 @@ trexDM_data_latest:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/trex
     - wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.3.root
-    - cp R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs R01929_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs
-    - restManager --fork --c 01_raw.rml --f "*.aqs"
-    - sleep 60
-    - ls -lrt
-    - restManager --fork --c 02_signal.rml --f "RawData*.root"
-    - sleep 60
-    - ls -lrt
-    - restManager --fork --c 03_hits.rml --f "Signals*.root"
-    - sleep 30
-    - ls -lrt
+    - restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs
+    - restManager --c 02_signal.rml --f RawData_01928.root
+    - restManager --c 03_hits.rml --f Signals_01928.root
     - restRoot -b -q ../MakeBasicTree.C'("Hits_01928.root")'
     - rm RawData_01928.root
     - rm Signals_01928.root
     - root -b -q ../ValidateTrees.C'("validation.root")'
-    - restRoot -b -q ../MakeBasicTree.C'("Hits_01929.root")'
-    - rm RawData_01929.root
-    - rm Signals_01929.root
-    - root -b -q ../ValidateTrees.C'("validation.root")'
-    - restRoot -b -q ValidateDetectorParams.C'("Hits_01929.root")'
+    - restRoot -b -q ValidateDetectorParams.C'("Hits_01928.root")'
   artifacts:
     paths:
-      - ${CI_PROJECT_DIR}/pipeline/trex/Hits_01929.root
+      - ${CI_PROJECT_DIR}/pipeline/trex/Hits_01928.root
     expire_in: 1 day
 
 pandaXIII_Topological: 
@@ -379,7 +368,7 @@ AnalysisPlot:
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/analysisPlot/
-    - restManager --c summary.rml --f ${CI_PROJECT_DIR}/pipeline/trex/Hits_01929.root
+    - restManager --c summary.rml --f ${CI_PROJECT_DIR}/pipeline/trex/Hits_01928.root
 
 AnalysisPlot2:
   type: postProcessing

From 18bd869c1c8d299b6e487567a569c9e443c4c0f5 Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 14:57:20 +0100
Subject: [PATCH 03/31] Fixing pipeline

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be59b1b55..8f06d3936 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -222,11 +222,11 @@ listRESTMacros:
     type: examples
     script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
-    - cd ${CI_PROJECT_DIR}/install_latest/examples/restG4/01.alphaTrack/
+    - cd ${CI_PROJECT_DIR}/install_latest/examples/01.alphaTrack/
+    - mkdir data
     - export RAW_PROCESSING=ON
     - export HIT_PROCESSING=ON
     - export TRACK_PROCESSING=ON
-    - mkdir data
     - restManager --c processing.rml --f ${CI_PROJECT_DIR}/install_latest/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
     - restRoot -b -q Validate.C'("data/Response_5MeV_1um.root")'
 

From e9b5649e7c3b810dd4c2092fe1e05241bd40a2b2 Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 17:14:11 +0100
Subject: [PATCH 04/31] examples/01.alphaTrack adapting to new ZeroSuppresion
 scheme

---
 examples/01.alphaTrack/processing.rml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/examples/01.alphaTrack/processing.rml b/examples/01.alphaTrack/processing.rml
index 2f8352549..a83912939 100644
--- a/examples/01.alphaTrack/processing.rml
+++ b/examples/01.alphaTrack/processing.rml
@@ -101,13 +101,15 @@
 		<addProcess type="TRestRawSignalAnalysisProcess" name="rawAna" title="Signal noise" value="${RAW_PROCESSING}" observable="all">
 		</addProcess>
 
-		<addProcess type="TRestRawZeroSuppresionProcess" name="zS" value="${HIT_PROCESSING}"
+		<addProcess type="TRestRawZeroSuppresionProcess" name="zS" value="${RAW_PROCESSING}"
 			baseLineRange="(5,55)"
 			integralRange="(10,500)"
 			pointThreshold="2"
 			pointsOverThreshold="5"
 			signalThreshold="3" />
 
+		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="${HIT_PROCESSING}" threshold="0.01" triggerStarts="0us" gain="1" />
+
 			<!-- Requires a bit of debugging 
 		<addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="${RAW_PROCESSING}" verboseLevel="info" observable="all" >
 		    <parameter name="daqChannels" value="240" />
@@ -118,10 +120,15 @@
 		<addProcess type="TRestDetectorSignalToHitsProcess" name="signalToHits" value="${HIT_PROCESSING}"
 			observable="all" method="all" />
 
-		<addProcess type="TRestDetectorHitsToTrackProcess" name="hitsToTrack" title="" value="${TRACK_PROCESSING}">
-			<parameter name="clusterDistance" value="2.5" units="mm" />
+		<addProcess type="TRestDetectorHitsToTrackFastProcess" name="hitsToTrack" 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}" 
+			clusterDistance="2.5mm" />
+
 		<addProcess type="TRestTrackReductionProcess" name="reduction" title="" value="${TRACK_PROCESSING}">
 			<parameter name="startingDistance" value="0.15mm" />
 			<parameter name="minimumDistance" value="0.5mm" />

From 4f1239df323dfc4d45fdfbff272cc46b6d9683e4 Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 18:57:06 +0100
Subject: [PATCH 05/31] Updating 01.alphaTrack Validate.C

---
 examples/01.alphaTrack/Validate.C | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/01.alphaTrack/Validate.C b/examples/01.alphaTrack/Validate.C
index 6d9611ae1..d5ad2b418 100644
--- a/examples/01.alphaTrack/Validate.C
+++ b/examples/01.alphaTrack/Validate.C
@@ -1,5 +1,6 @@
 Int_t Validate(string fname) {
     TRestRun* run = new TRestRun(fname);
+    cout << "Run entries : " << run->GetEntries() << endl;
     if (run->GetEntries() != 4424) {
         cout << "The number of entries is not 4424!" << endl;
         return 1;

From e6e34c077755311b31a3c1484fe3a67956915f6c Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 21:37:00 +0100
Subject: [PATCH 06/31] examples/01.alphaTrack. Minor README update

---
 examples/01.alphaTrack/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/01.alphaTrack/README.md b/examples/01.alphaTrack/README.md
index 3bc967a9b..715b1bb5c 100644
--- a/examples/01.alphaTrack/README.md
+++ b/examples/01.alphaTrack/README.md
@@ -2,7 +2,7 @@ This example shows how to include the detector response and the reconstruction o
 
 The processes included have been adapted to facilitate the reconstruction of short energetic alpha tracks. Before using the example it is necessary to generate the Geant4 event MC data. You may use the following restG4 [example](https://github.com/rest-for-physics/restG4/examples/08.Alphas).
 
-A quick recipe to generate the necessary data.
+A quick recipe to generate the necessary data follows.
 
 Copy this example at your working directory. Then copy the restG4 generator example.
 

From dc1ba5bec4e4cbb74131a938ea31f9f7426d7743 Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 21:58:31 +0100
Subject: [PATCH 07/31] examples/01.alphaTrack increasing validation range

---
 examples/01.alphaTrack/Validate.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/01.alphaTrack/Validate.C b/examples/01.alphaTrack/Validate.C
index d5ad2b418..cdba78ea7 100644
--- a/examples/01.alphaTrack/Validate.C
+++ b/examples/01.alphaTrack/Validate.C
@@ -1,8 +1,8 @@
 Int_t Validate(string fname) {
     TRestRun* run = new TRestRun(fname);
     cout << "Run entries : " << run->GetEntries() << endl;
-    if (run->GetEntries() != 4424) {
-        cout << "The number of entries is not 4424!" << endl;
+    if (run->GetEntries() < 4350 || run->GetEntries() > 4500) {
+        cout << "The number of entries is not in the range (4350,4500)!" << endl;
         return 1;
     }
     delete run;

From b10865c717477574480210cf061166a8f3286c9f Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 22:27:59 +0100
Subject: [PATCH 08/31] pipeline/trexdm fixing chain connectivity

---
 pipeline/trex/02_signal.rml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pipeline/trex/02_signal.rml b/pipeline/trex/02_signal.rml
index e0bf39fff..56a8efe8b 100644
--- a/pipeline/trex/02_signal.rml
+++ b/pipeline/trex/02_signal.rml
@@ -22,6 +22,8 @@
 			signalThreshold="${SGNL_TH}"
 			verboseLevel="silent"	/>
 
+		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="${HIT_PROCESSING}" threshold="0.01" triggerStarts="0us" gain="1" />
+
 		<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" />

From bbe7181f94099f85c7ff5595886bbf4cabbd089c Mon Sep 17 00:00:00 2001
From: git <javier.galan@unizar.es>
Date: Mon, 31 Jan 2022 22:46:00 +0100
Subject: [PATCH 09/31] pipeline/trexdm fixing pipeline

---
 pipeline/trex/02_signal.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline/trex/02_signal.rml b/pipeline/trex/02_signal.rml
index 56a8efe8b..6554735da 100644
--- a/pipeline/trex/02_signal.rml
+++ b/pipeline/trex/02_signal.rml
@@ -22,7 +22,7 @@
 			signalThreshold="${SGNL_TH}"
 			verboseLevel="silent"	/>
 
-		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="${HIT_PROCESSING}" threshold="0.01" triggerStarts="0us" gain="1" />
+		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="ON" threshold="0.01" triggerStarts="0us" gain="1" />
 
 		<addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="ON" verboseLevel="info" observable="all" >
 		    <parameter name="daqChannels" value="72*4*4" />

From 03f8328c029b669555178475c18f70e0dd154e36 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 2 Feb 2022 19:15:08 +0100
Subject: [PATCH 10/31] Trying do address trex pipeline

---
 pipeline/trex/02_signal.rml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pipeline/trex/02_signal.rml b/pipeline/trex/02_signal.rml
index 6554735da..3f13748e1 100644
--- a/pipeline/trex/02_signal.rml
+++ b/pipeline/trex/02_signal.rml
@@ -13,16 +13,18 @@
 
 		<parameter name="eventsToProcess" value="0" />
 
-		<addProcess type="TRestRawZeroSuppresionProcess" name="zS" value="ON"
-			baseLineRange="(${BL_MIN},${BL_MAX})"
-			integralRange="(${INT_MIN},${INT_MAX})"
-			pointThreshold="${POINT_TH}"
-			pointsOverThreshold="${NPOINTS}"
-			sampling="${SAMPLING}"
-			signalThreshold="${SGNL_TH}"
-			verboseLevel="silent"	/>
-
-		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="ON" threshold="0.01" triggerStarts="0us" gain="1" />
+		<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}"
+		       pointsOverThreshold="${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" />

From 96d7bc5f1cc5d6a45dfd2207fbde3fd29adda13d Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 2 Feb 2022 19:15:58 +0100
Subject: [PATCH 11/31] Updating alphaTrack example with current code changes

---
 examples/01.alphaTrack/processing.rml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/01.alphaTrack/processing.rml b/examples/01.alphaTrack/processing.rml
index a83912939..936ecddd2 100644
--- a/examples/01.alphaTrack/processing.rml
+++ b/examples/01.alphaTrack/processing.rml
@@ -101,15 +101,17 @@
 		<addProcess type="TRestRawSignalAnalysisProcess" name="rawAna" title="Signal noise" value="${RAW_PROCESSING}" observable="all">
 		</addProcess>
 
-		<addProcess type="TRestRawZeroSuppresionProcess" name="zS" value="${RAW_PROCESSING}"
+		<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"
 			pointsOverThreshold="5"
 			signalThreshold="3" />
 
-		<addProcess type="TRestRawToDetectorSignalProcess" name="detSignal" value="${HIT_PROCESSING}" threshold="0.01" triggerStarts="0us" gain="1" />
-
 			<!-- Requires a bit of debugging 
 		<addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="${RAW_PROCESSING}" verboseLevel="info" observable="all" >
 		    <parameter name="daqChannels" value="240" />

From accaae94b257fe72eddf158f98086a1978aa9d19 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 16 Mar 2022 09:22:59 +0100
Subject: [PATCH 12/31] Adding static function TRestHits::GetBoundaries as a
 generic method to get hits boundaries

---
 source/framework/core/inc/TRestHits.h   |  2 ++
 source/framework/core/src/TRestHits.cxx | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/source/framework/core/inc/TRestHits.h b/source/framework/core/inc/TRestHits.h
index 453c0975c..ec2ed241d 100644
--- a/source/framework/core/inc/TRestHits.h
+++ b/source/framework/core/inc/TRestHits.h
@@ -194,6 +194,8 @@ class TRestHits : public TObject {
 
     void WriteHitsToTextFile(TString filename);
 
+    static void GetBoundaries(std::vector<double> &val, double &max, double &min, int &nBins, double offset=10);
+
     virtual void PrintHits(Int_t nHits = -1);
 
     class TRestHits_Iterator : public std::iterator<std::random_access_iterator_tag, TRestHits_Iterator> {
diff --git a/source/framework/core/src/TRestHits.cxx b/source/framework/core/src/TRestHits.cxx
index 255fbd1e6..bf2829426 100644
--- a/source/framework/core/src/TRestHits.cxx
+++ b/source/framework/core/src/TRestHits.cxx
@@ -558,6 +558,26 @@ void TRestHits::WriteHitsToTextFile(TString filename) {
     fclose(fff);
 }
 
+void TRestHits::GetBoundaries(std::vector<double> &dist, double &max, double &min, int &nBins, double offset){
+ 
+  std::sort(dist.begin(),dist.end());
+  max=dist.back();
+  min=dist.front();
+
+  double minDiff = 1E6;
+  double prevVal=1E6;
+   for (const auto &h : dist){
+     double diff = std::abs( h - prevVal);
+     if(diff>0 && diff<minDiff )minDiff=diff;
+     prevVal=h;
+   }
+
+  max += offset*minDiff + minDiff/2.;
+  min -= offset*minDiff + minDiff/2.;
+  nBins = std::round((max-min)/minDiff);
+
+}
+
 Double_t TRestHits::GetGaussSigmaX() {
 	Double_t gausSigmaX = 0;
 	Int_t nHits = GetNumberOfHits();

From 85e0232cff3a7243915a673c8c82d02dc70bf823 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 16 Mar 2022 09:24:18 +0100
Subject: [PATCH 13/31] Adding new static function to perform kMeansClustering
 of volume hits

---
 source/framework/core/inc/TRestVolumeHits.h   |  2 +
 source/framework/core/src/TRestVolumeHits.cxx | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/source/framework/core/inc/TRestVolumeHits.h b/source/framework/core/inc/TRestVolumeHits.h
index 821bbeb85..e1a3666b9 100644
--- a/source/framework/core/inc/TRestVolumeHits.h
+++ b/source/framework/core/inc/TRestVolumeHits.h
@@ -67,6 +67,8 @@ class TRestVolumeHits : public TRestHits {
     }
     Double_t GetXYSize(int n) { return TMath::Sqrt(fSigmaX[n] * fSigmaX[n] + fSigmaY[n] * fSigmaY[n]); }
 
+    static void kMeansClustering(TRestVolumeHits *hits, TRestVolumeHits &vHits, int maxIt =100);
+
     // Constructor & Destructor
     TRestVolumeHits();
     ~TRestVolumeHits();
diff --git a/source/framework/core/src/TRestVolumeHits.cxx b/source/framework/core/src/TRestVolumeHits.cxx
index f4c7ff306..0a12dbae8 100644
--- a/source/framework/core/src/TRestVolumeHits.cxx
+++ b/source/framework/core/src/TRestVolumeHits.cxx
@@ -163,3 +163,54 @@ void TRestVolumeHits::PrintHits() {
              << " Energy: " << GetEnergy(n) << endl;
     }
 }
+
+
+//______________________________________________________________________________
+void TRestVolumeHits::kMeansClustering(TRestVolumeHits *hits, TRestVolumeHits &vHits, int maxIt){
+
+        const int nodes = vHits.GetNumberOfHits();
+        TRestVolumeHits volHits[nodes];
+        //std::cout<<"Nhits "<<hits->GetNumberOfHits()<<" Nodes "<<nodes<<std::endl;
+        TVector3 nullVector = TVector3(0,0,0);
+        std::vector<TVector3> centroid(nodes);
+        std::vector<TVector3> centroidOld(nodes,nullVector);
+
+          for(int h=0;h<nodes; h++)centroid[h] = vHits.GetPosition(h);
+         
+           for(int it=0;it<maxIt;it++){
+             for(int n=0;n<nodes;n++)volHits[n].RemoveHits();
+               for (int i = 0; i < hits->GetNumberOfHits(); i++){
+                 double minDist=1E9;
+                 int clIndex=-1;
+                   for(int n=0;n<nodes;n++){
+                     TVector3 hitPos =hits->GetPosition(i);
+                     double dist = (centroid[n] - hitPos).Mag();
+                       if(dist < minDist){
+                         minDist=dist;
+                         clIndex=n;
+                       }
+                   }
+                 //cout<<minDist<<" "<<clIndex<<endl;
+                 volHits[clIndex].AddHit(*hits,i);
+               }
+              bool converge=true;
+                for(int n=0;n<nodes;n++){
+                  centroid[n] = volHits[n].GetMeanPosition();
+                  converge &= (centroid[n] == centroidOld[n]);
+                  centroidOld[n] = centroid[n];
+                }
+              if(converge){
+              break;
+              }
+           }
+
+       vHits.RemoveHits();
+       const TVector3 sigma(0., 0., 0.);
+         for(int n=0;n<nodes;n++){
+             if(volHits[n].GetNumberOfHits()>0)
+             vHits.AddHit(volHits[n].GetMeanPosition(),volHits[n].GetTotalEnergy(),0,volHits[n].GetType(0),sigma);
+         }
+
+}
+
+

From 8e42db6acdd1b4138587173d5f59513cbdbf3cc3 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 16 Mar 2022 09:25:40 +0100
Subject: [PATCH 14/31] Adding scaling option to TRestAnalysisPlot that can be
 used to plot the Rate

---
 source/framework/core/inc/TRestAnalysisPlot.h   |  1 +
 source/framework/core/src/TRestAnalysisPlot.cxx | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/source/framework/core/inc/TRestAnalysisPlot.h b/source/framework/core/inc/TRestAnalysisPlot.h
index fcdb2b608..0058f7ad8 100644
--- a/source/framework/core/inc/TRestAnalysisPlot.h
+++ b/source/framework/core/inc/TRestAnalysisPlot.h
@@ -70,6 +70,7 @@ class TRestAnalysisPlot : public TRestMetadata {
         string title;
 
         Double_t normalize;
+        string scale;
         Bool_t logX;
         Bool_t logY;
         Bool_t logZ;
diff --git a/source/framework/core/src/TRestAnalysisPlot.cxx b/source/framework/core/src/TRestAnalysisPlot.cxx
index 05af8fd14..85c9b7642 100644
--- a/source/framework/core/src/TRestAnalysisPlot.cxx
+++ b/source/framework/core/src/TRestAnalysisPlot.cxx
@@ -247,6 +247,7 @@ void TRestAnalysisPlot::InitFromConfigFile() {
             plot.gridY = StringToBool(GetParameter("gridY", plotele, "false"));
             plot.gridX = StringToBool(GetParameter("gridX", plotele, "false"));
             plot.normalize = StringToDouble(GetParameter("norm", plotele, ""));
+            plot.scale = GetParameter("scale", plotele, "");
             plot.labelX = GetParameter("xlabel", plotele, "");
             plot.labelY = GetParameter("ylabel", plotele, "");
             plot.ticksX = StringToInteger(GetParameter("xticks", plotele, "510"));
@@ -843,7 +844,7 @@ void TRestAnalysisPlot::PlotCombinedCanvas() {
             continue;
         }
 
-        // scale the histograms
+        // normalize the histograms
         if (plot.normalize > 0) {
             for (unsigned int i = 0; i < plot.histos.size(); i++) {
                 if (plot.histos[i].ptr == nullptr) continue;
@@ -855,6 +856,18 @@ void TRestAnalysisPlot::PlotCombinedCanvas() {
             }
         }
 
+       // scale the histograms
+       if (plot.scale != "") {
+            for (unsigned int i = 0; i < plot.histos.size(); i++) {
+                if (plot.histos[i].ptr == nullptr) continue;
+                Double_t scale = 1.;
+                if(plot.scale == "binSize")scale =  1./plot.histos[i].ptr->GetXaxis()->GetBinWidth(1);
+                else scale=StringToDouble(plot.scale);
+
+                plot.histos[i].ptr->Scale(scale);
+            }
+        }
+
         // draw to the pad
         targetPad = (TPad*)fCombinedCanvas->cd(n + 1 + fPanels.size());
         Double_t maxValue_Pad = 0;

From 019fba6d2ac37c90ce24251f736ff53007ab9af1 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 16 Mar 2022 09:26:38 +0100
Subject: [PATCH 15/31] Adding AlphaCAMM project as a submodule to the
 repository

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 898d2c9a8..2079d1c40 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "doc/userguide"]
 	path = doc/userguide
 	url = https://github.com/rest-for-physics/rest-docs.github.io.git
+[submodule "projects/alphacamm"]
+	path = projects/alphacamm
+	url = git@lfna.unizar.es:gifna/alphacamm.git

From ffe3759471953828b7305b04d057dffc3d8a0118 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 11:10:37 +0100
Subject: [PATCH 16/31] Trying to fix pipeline error

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e2f9c77e..2d1385e10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,8 @@ stages:
   # Stage to validate restG4 package examples
   - restG4
 
+  # Stage to validate framework examples
+  - examples
 
   # Stage to validate data chain processing constructions (TREX-DM data, PandaX-III topology, etc).
   - restManager_process

From 29ca94525a55ca3be61ddc430f69d602547cbae1 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 12:20:41 +0100
Subject: [PATCH 17/31] Making FindGarfieldOlf more generic including Heed inc
 dirs

---
 cmake/FindGarfieldOld.cmake | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmake/FindGarfieldOld.cmake b/cmake/FindGarfieldOld.cmake
index 23ba04475..4642d9c5e 100644
--- a/cmake/FindGarfieldOld.cmake
+++ b/cmake/FindGarfieldOld.cmake
@@ -15,14 +15,17 @@
 set(Garfield_DIR $ENV{GARFIELD_HOME})
 
 find_path(Garfield_INCLUDE_DIRS Sensor.hh
-        HINTS ${Garfield_DIR}/include/ ${Garfield_DIR}/include/Garfield ${Garfield_INC_DIR}
-        ${Garfield_DIR}/Include)
+        HINTS ${Garfield_DIR}/Include/ ${Garfield_DIR}/Include/Garfield
+        ${Garfield_DIR}/include/ ${Garfield_DIR}/include/Garfield)
+
+find_path(Garfield_INCLUDE_Heed_DIRS HeedChamber.hh
+        HINTS ${Garfield_DIR}/Heed/)
 
 #message(STATUS Garfield_INCLUDE_DIRS ${Garfield_INCLUDE_DIRS})
 
 find_library(Garfield_LIBRARIES NAMES libGarfield.so Garfield
         HINTS ${Garfield_DIR}/lib ${Garfield_LIB_DIR}
-        $ENV{GARFIELD_HOME}/lib)
+        $ENV{GARFIELD_DIR}/lib)
 #message(STATUS Garfield_LIBRARIES ${Garfield_LIBRARIES})
 
 #if (${Garfield_LIBRARY_DIR})

From bcfab0356012f249ed199ae0a92ac418d3e87464 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 12:22:51 +0100
Subject: [PATCH 18/31] Fixing typo

---
 examples/01.alphaTrack/processing.rml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/01.alphaTrack/processing.rml b/examples/01.alphaTrack/processing.rml
index d75d1c87e..cef51e520 100644
--- a/examples/01.alphaTrack/processing.rml
+++ b/examples/01.alphaTrack/processing.rml
@@ -102,15 +102,15 @@
 		</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"
-			pointsOverThreshold="5"
-			signalThreshold="3" />
+                  triggerStarts="0us"
+                  gain="1"
+                  threshold="0.01"
+                  zeroSuppression="true"
+		  baseLineRange="(5,55)"
+		  integralRange="(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" >

From 8217039d59eee4f8391036d441521ae33343c793 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 12:52:48 +0100
Subject: [PATCH 19/31] Removing duplicated HitsToTrackProcess, trying to fix
 pipeline...

---
 examples/01.alphaTrack/processing.rml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/01.alphaTrack/processing.rml b/examples/01.alphaTrack/processing.rml
index cef51e520..b97e1d253 100644
--- a/examples/01.alphaTrack/processing.rml
+++ b/examples/01.alphaTrack/processing.rml
@@ -122,13 +122,16 @@
 		<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="TRestDetectorHitsToTrackProcess" name="hitsToTrack" title="" value="${TRACK_PROCESSING}">
 			<parameter name="clusterDistance" value="1" units="cm" />
 		</addProcess>
 
-		<addProcess type="TRestDetectorHitsToTrackProcess" name="hitsToTrack" title="" value="${TRACK_PROCESSING}" 
-			clusterDistance="2.5mm" />
-
 		<addProcess type="TRestTrackReductionProcess" name="reduction" title="" value="${TRACK_PROCESSING}">
 			<parameter name="startingDistance" value="0.15mm" />
 			<parameter name="minimumDistance" value="0.5mm" />

From 6b969ade9f382a2592037a070759a8ac13d2ea2a Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 13:44:27 +0100
Subject: [PATCH 20/31] Trying to fix pandaX pipeline after removal of
 TRestRawZeroSuppresionProcess

---
 pipeline/pandaxiii_MC/processes_2D.rml  | 13 +++++++------
 pipeline/pandaxiii_data/P3AutoChain.rml |  4 +++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pipeline/pandaxiii_MC/processes_2D.rml b/pipeline/pandaxiii_MC/processes_2D.rml
index b6e3184cd..10cd16847 100644
--- a/pipeline/pandaxiii_MC/processes_2D.rml
+++ b/pipeline/pandaxiii_MC/processes_2D.rml
@@ -439,18 +439,19 @@
         <observable name="Qratio_Y_R30" value="ON" />
         <parameter name="hitsToCheckFraction" value="0.25" />
     </TRestTrackBlobAnalysisProcess>
-    <TRestRawZeroSuppresionProcess name="zS" title="" verboseLevel="silent">
-        <!-- This parameter is used to define the baseline calculation -->
-        <parameter name="baseLineRange" value="(50,120)" />
+    <TRestRawToDetectorSignalProcess name="zS" title="" verboseLevel="silent">
         <!-- 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.
          minPeakAmplitude : Minimum peak signal amplitude to be considered at all.
         -->
+        <!-- This parameter is used to define the baseline calculation -->
+        <parameter name="baseLineRange" value="(50,120)" />
+        <parameter name="zeroSuppression" value="true" />
         <parameter name="pointThreshold" value="1.9" />
-        <parameter name="pointsOverThreshold" value="10" />
+        <parameter name="nPointsOverThreshold" value="10" />
         <parameter name="signalThreshold" value="2.8" />
-    </TRestRawZeroSuppresionProcess>
+    </TRestRawToDetectorSignalProcess>
     <TRestRawSignalAnalysisProcess name="sAna" title="" verboseLevel="silent">
         <!-- This parameter defines every how many seconds a signal will be drawn.
          In case the value is zero. There will not be any drawing. -->
@@ -465,7 +466,7 @@
          minPeakAmplitude : Minimum peak signal amplitude to be considered at all.
         -->
         <parameter name="pointThreshold" value="1.9" />
-        <parameter name="pointsOverThreshold" value="10" />
+        <parameter name="nPointsOverThreshold" value="10" />
         <parameter name="signalThreshold" value="2.8" />
         <!-- ++++++++++++++++++++++
          Observable definitions
diff --git a/pipeline/pandaxiii_data/P3AutoChain.rml b/pipeline/pandaxiii_data/P3AutoChain.rml
index d32a4952b..4fd585ab6 100644
--- a/pipeline/pandaxiii_data/P3AutoChain.rml
+++ b/pipeline/pandaxiii_data/P3AutoChain.rml
@@ -56,7 +56,9 @@
 
     </addProcess>
     <addProcess type="TRestEventRateAnalysisProcess" name="rateAna" value="ON" observable="all"/>
-    <addProcess type="TRestRawZeroSuppresionProcess" name="zS" value="ON" sampling="0.2us"/> 5MHz sampling
+    <addProcess type="TRestRawToDetectorSignalProcess" name="rawToSignal" value="ON"
+         sampling="0.2us"
+         zeroSuppression="true" />
 
     <addProcess type="TRestRealTimeDrawingProcess" name="rD" value="ON" drawInterval="1000" >
       <TRestAnalysisPlot name="TriggerRatePlot"  previewPlot="false">

From 83a3f71c21245eba16fda97996013087f42d8384 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 17:53:29 +0100
Subject: [PATCH 21/31] Trying to fix pandax pipeline with new code changes

---
 pipeline/pandaxiii_data/P3AutoChain.rml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pipeline/pandaxiii_data/P3AutoChain.rml b/pipeline/pandaxiii_data/P3AutoChain.rml
index 4fd585ab6..4aca52d61 100644
--- a/pipeline/pandaxiii_data/P3AutoChain.rml
+++ b/pipeline/pandaxiii_data/P3AutoChain.rml
@@ -31,7 +31,7 @@
 
     <addProcess type="TRestRawMultiCoBoAsAdToSignalProcess" name="virtualDAQ" value="ON"/>
     <addProcess type="TRestRawSignalAnalysisProcess" name="sAna" value="ON">
-
+      <parameter name="pointsOverThreshold" value="3" />
       /// We define all observables except MinValue because it is not yet in validation chain
       <observable name="BaseLineMean" value="ON" />
       <observable name="BaseLineSigmaMean" value="ON" />
@@ -56,10 +56,12 @@
 
     </addProcess>
     <addProcess type="TRestEventRateAnalysisProcess" name="rateAna" value="ON" observable="all"/>
-    <addProcess type="TRestRawToDetectorSignalProcess" name="rawToSignal" value="ON"
-         sampling="0.2us"
-         zeroSuppression="true" />
-
+    <addProcess type="TRestRawToDetectorSignalProcess" name="rawSignalToSignal" value="ON">
+       <parameter name="sampling" value="0.2us"/>
+       <parameter name="zeroSuppression" value="true"/>
+       <parameter name="nPointsOverThreshold" value="3" />
+    </addProcess>
+    
     <addProcess type="TRestRealTimeDrawingProcess" name="rD" value="ON" drawInterval="1000" >
       <TRestAnalysisPlot name="TriggerRatePlot"  previewPlot="false">
         <canvas size="(1000,800)" save="TriggerRate.png"/>
@@ -80,7 +82,6 @@
     <parameter name="mainDataPath" value="" />
 
     <parameter name="pointThreshold" value="3" />
-    <parameter name="pointsOverThreshold" value="3" />
   </globals>
 
 </TRestManager>

From 86042ad2c705048da739db89dd371b1d66653bd8 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 19:08:29 +0100
Subject: [PATCH 22/31] Fixing trex pipeline

---
 pipeline/trex/02_signal.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline/trex/02_signal.rml b/pipeline/trex/02_signal.rml
index 3f13748e1..231a2e194 100644
--- a/pipeline/trex/02_signal.rml
+++ b/pipeline/trex/02_signal.rml
@@ -21,7 +21,7 @@
 		       baseLineRange="(${BL_MIN},${BL_MAX})"
 		       integralRange="(${INT_MIN},${INT_MAX})"
 		       pointThreshold="${POINT_TH}"
-		       pointsOverThreshold="${NPOINTS}"
+		       nPointsOverThreshold="${NPOINTS}"
 		       sampling="${SAMPLING}"
 		       signalThreshold="${SGNL_TH}"
 		       verboseLevel="silent" />

From ac040aaf110a9199a37d9e169a845c713a179ca5 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Thu, 17 Mar 2022 23:38:39 +0100
Subject: [PATCH 23/31] Removing TRestRawZeroSuppresionProcess from rml
 examples

---
 examples/multiFeminos.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/multiFeminos.rml b/examples/multiFeminos.rml
index 633939ff7..95859dc7a 100644
--- a/examples/multiFeminos.rml
+++ b/examples/multiFeminos.rml
@@ -38,7 +38,7 @@
       <parameter name="pointThreshold" value="3" />
       <parameter name="pointsOverThreshold" value="3" />
     </addProcess>
-    <addProcess type="TRestRawZeroSuppresionProcess" name="zS" value="ON" file="processes.rml"/>
+    <addProcess type="TRestRawToDetectorSignalProcess" name="zS" value="ON" file="processes.rml"/>
 
   </TRestProcessRunner>
 

From 0abfa409de883e5f07aed233b535bf06e1cc03a8 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Tue, 22 Mar 2022 13:05:21 +0100
Subject: [PATCH 24/31] Fixing bug in FindGarfieldOld

---
 cmake/FindGarfieldOld.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/FindGarfieldOld.cmake b/cmake/FindGarfieldOld.cmake
index 4642d9c5e..264963061 100644
--- a/cmake/FindGarfieldOld.cmake
+++ b/cmake/FindGarfieldOld.cmake
@@ -24,8 +24,7 @@ find_path(Garfield_INCLUDE_Heed_DIRS HeedChamber.hh
 #message(STATUS Garfield_INCLUDE_DIRS ${Garfield_INCLUDE_DIRS})
 
 find_library(Garfield_LIBRARIES NAMES libGarfield.so Garfield
-        HINTS ${Garfield_DIR}/lib ${Garfield_LIB_DIR}
-        $ENV{GARFIELD_DIR}/lib)
+        HINTS ${Garfield_DIR}/lib ${Garfield_LIB_DIR})
 #message(STATUS Garfield_LIBRARIES ${Garfield_LIBRARIES})
 
 #if (${Garfield_LIBRARY_DIR})

From 69fb87850042dc2765ec975784cffbf94ecb3393 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 30 Mar 2022 11:15:30 +0200
Subject: [PATCH 25/31] Trying to fix pipeline after merging with master

---
 .gitlab-ci.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1a2df2f0..1914384fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,17 +155,29 @@ List REST Macros:
 08_alphas:
   type: restG4
   script:
-    - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
-    - cd ${CI_PROJECT_DIR}/install_latest/examples/restG4/08.Alphas/
+    - source ${CI_PROJECT_DIR}/install/thisREST.sh
+    - cd ${CI_PROJECT_DIR}/install/examples/restG4/08.Alphas/
     - mkdir data
     - export REST_ENERGY=5
     - export REST_FOIL=1
     - restG4 alphas.rml
   artifacts:
     paths:
-      - ${CI_PROJECT_DIR}/install_latest/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
+      - ${CI_PROJECT_DIR}/install/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
     expire_in: 1 day
 
+01_alphaTrack:
+    type: examples
+    script:
+    - source ${CI_PROJECT_DIR}/install/thisREST.sh
+    - cd ${CI_PROJECT_DIR}/install/examples/01.alphaTrack/
+    - mkdir data
+    - export RAW_PROCESSING=ON
+    - export HIT_PROCESSING=ON
+    - export TRACK_PROCESSING=ON
+    - restManager --c processing.rml --f ${CI_PROJECT_DIR}/install/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
+    - restRoot -b -q Validate.C'("data/Response_5MeV_1um.root")'
+
 Load Gas:
   type: metadata
   script:

From ff37137849389dc9c2233242318e943f70568c0b Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Wed, 20 Apr 2022 23:01:55 +0200
Subject: [PATCH 26/31] Fixing compilation error after merge with master

---
 source/framework/core/inc/TRestAnalysisPlot.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/framework/core/inc/TRestAnalysisPlot.h b/source/framework/core/inc/TRestAnalysisPlot.h
index fb5fdab77..0a40200cb 100644
--- a/source/framework/core/inc/TRestAnalysisPlot.h
+++ b/source/framework/core/inc/TRestAnalysisPlot.h
@@ -71,7 +71,7 @@ class TRestAnalysisPlot : public TRestMetadata {
         std::string title;
 
         Double_t normalize;
-        string scale;
+        std::string scale;
         Bool_t logX;
         Bool_t logY;
         Bool_t logZ;

From ccd048a7a02479e51c1be64576ce3b5a9d450cd2 Mon Sep 17 00:00:00 2001
From: jgalan <javier.galan@unizar.es>
Date: Mon, 25 Apr 2022 13:12:45 +0200
Subject: [PATCH 27/31] Increasing tracklib submodule to 1.3

---
 source/libraries/track | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libraries/track b/source/libraries/track
index 9d1c59f41..9cf0fe325 160000
--- a/source/libraries/track
+++ b/source/libraries/track
@@ -1 +1 @@
-Subproject commit 9d1c59f41b2dc183ff7a96a5f2472d763b237e5c
+Subproject commit 9cf0fe325eb3bfb1a1ad38ce8909b81e51fba5b4

From e138c59c31c5aa6fb6a86f4469b0d438d4718220 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Mon, 25 Apr 2022 13:37:56 +0200
Subject: [PATCH 28/31] Increasing rawlib submodule to 1.6

---
 source/libraries/raw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libraries/raw b/source/libraries/raw
index ee15907d6..b15d1ccd0 160000
--- a/source/libraries/raw
+++ b/source/libraries/raw
@@ -1 +1 @@
-Subproject commit ee15907d61b4d37e9b557ae0ea11d7faa1d89b90
+Subproject commit b15d1ccd0d435f4f94efe4e80d2540fb6322bd76

From 5e0610fd07647f979ce232bf521a6aa6d7c77d42 Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Mon, 25 Apr 2022 13:39:38 +0200
Subject: [PATCH 29/31] Increasing connectorslib submodule to 1.2

---
 source/libraries/connectors | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libraries/connectors b/source/libraries/connectors
index 94d065081..de207df10 160000
--- a/source/libraries/connectors
+++ b/source/libraries/connectors
@@ -1 +1 @@
-Subproject commit 94d0650815663e6dd7c969392471bbb25d5ac9c9
+Subproject commit de207df10a82093c23e90c1d30baa96282a06aee

From 8a33774aec95a94551f78d7d275f517fab84f9ee Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Mon, 25 Apr 2022 13:44:26 +0200
Subject: [PATCH 30/31] Increasing detectorlib submodule to 1.7

---
 source/libraries/detector | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libraries/detector b/source/libraries/detector
index f2962614b..54ef8f069 160000
--- a/source/libraries/detector
+++ b/source/libraries/detector
@@ -1 +1 @@
-Subproject commit f2962614b061acffc0d2ea16c4a93ba5b4429b1e
+Subproject commit 54ef8f069b2936c0d84c99c0931aad1ed4d8c71d

From 792df26e4c8fcc8c058bf77e689ca0cc6ceb5a8e Mon Sep 17 00:00:00 2001
From: juanan <juanan318@gmail.com>
Date: Mon, 25 Apr 2022 13:54:16 +0200
Subject: [PATCH 31/31] Updated TRestVersion.h to v2.3.12

---
 source/framework/core/inc/TRestVersion.h | 33 ++++++++++++------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/source/framework/core/inc/TRestVersion.h b/source/framework/core/inc/TRestVersion.h
index a92b5dd8a..3f8a2e2f1 100644
--- a/source/framework/core/inc/TRestVersion.h
+++ b/source/framework/core/inc/TRestVersion.h
@@ -1,21 +1,20 @@
 #ifndef REST_Version
 #define REST_Version
-/* Version information automatically generated by installer. */ /*
-                                                                 * These macros can be used in the following
-                                                                 * way:
-                                                                 *
-                                                                 * #if REST_VERSION_CODE >=
-                                                                 * REST_VERSION(2,23,4) #include <newheader.h>
-                                                                 * #else
-                                                                 *     #include <oldheader.h>
-                                                                 * #endif
-                                                                 *
-                                                                 */
-#define REST_RELEASE "2.3.11"
-#define REST_RELEASE_DATE "Mon Mar 14"
-#define REST_RELEASE_TIME "16:36:38 CET 2022"
-#define REST_GIT_COMMIT "806bfa64"
-#define REST_VERSION_CODE 131851
-#define REST_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
+/* Version information automatically generated by installer. *//*
+ * These macros can be used in the following way:
+ * 
+ * #if REST_VERSION_CODE >= REST_VERSION(2,23,4)
+ *     #include <newheader.h>
+ * #else
+ *     #include <oldheader.h>
+ * #endif
+ *
+ */
+#define REST_RELEASE "2.3.12"
+#define REST_RELEASE_DATE "lun abr 25"
+#define REST_RELEASE_TIME "13:50:03 CEST 2022"
+#define REST_GIT_COMMIT "8a33774a"
+#define REST_VERSION_CODE 131852
+#define REST_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 #define REST_SCHEMA_EVOLUTION "ON"
 #endif