diff --git a/.github/pr-badge.yml b/.github/pr-badge.yml
index f6df80e01..a3888ba61 100644
--- a/.github/pr-badge.yml
+++ b/.github/pr-badge.yml
@@ -15,3 +15,5 @@
   when: "$additions < 100"
 - imageUrl: "https://gitlab.cern.ch/rest-for-physics/framework/badges/$branchName/pipeline.svg"
   url: "https://gitlab.cern.ch/rest-for-physics/framework/-/commits/$branchName"
+- imageUrl: "https://github.com/rest-for-physics/framework/actions/workflows/validation.yml/badge.svg?branch=$branchName"
+  url: "https://github.com/rest-for-physics/framework/commits/$branchName"
\ No newline at end of file
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index fb0475052..212d6ce18 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -21,7 +21,6 @@ defaults:
   run:
     shell: bash
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
   build-test:
@@ -75,32 +74,6 @@ jobs:
           path: ${{ env.REST_PATH }}
           retention-days: 1
 
-  framework-install-reference:
-    name: Build with reference version of dependencies
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build and install
-        uses: ./.github/actions/build
-        with:
-          cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON"
-          branch: ${{ env.BRANCH_NAME }}
-      - name: Test REST
-        run: |
-          printenv
-          cat ${{ env.REST_PATH }}/thisREST.sh
-          source ${{ env.REST_PATH }}/thisREST.sh
-          restManager ListMacros
-          restRoot -b -q
-      - name: Cache framework installation
-        id: framework-install-cache-reference
-        uses: actions/cache@v3
-        with:
-          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
-          path: ${{ env.REST_PATH }}
-
   metadata:
     name: "Metadata"
     runs-on: ubuntu-latest
@@ -155,8 +128,8 @@ jobs:
     name: "PandaX-III"
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022
-    needs: [ framework-install-reference ]
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
+    needs: [ framework-install ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -168,7 +141,7 @@ jobs:
           ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }}
       - name: Restore cache
         uses: actions/cache@v3
-        id: framework-install-cache-reference
+        id: framework-install-cache
         with:
           key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
           path: ${{ env.REST_PATH }}
@@ -176,21 +149,22 @@ jobs:
         run: |
           source  ${{ env.REST_PATH }}/thisREST.sh
           cd framework/pipeline/pandaxiii_MC
-          restG4 Xe136bb0n.rml
-          restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")'
+          restG4 Xe136bb0n.rml -o Xe136bb0n.root
+          restRoot -b -q ValidateG4.C'("Xe136bb0n.root")'
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
           name: Xe136bb
-          path: framework/pipeline/pandaxiii_MC/Xe136bb0n_n2E06.root
+          path: framework/pipeline/pandaxiii_MC/Xe136bb0n.root
           retention-days: 1
       - name: PandaXIII Topological
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd framework/pipeline/pandaxiii_MC
-          restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10
-          restRoot -b -q ../MakeBasicTree.C'("testOutput.root")'
-          restRoot -b -q ../ValidateTrees.C'("validation.root")'
+          restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root --j 1 --e 10
+          restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")'
+          restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")'
+          # restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root
       # This command is failing in the docker, reproducible locally, not clear why...
       #        echo | sleep 5 | restManager --c plots.rml --i testOutput.root
       #    - name: Upload Artifacts
@@ -204,14 +178,14 @@ jobs:
           source ${{ env.REST_PATH }}/thisREST.sh
           cd framework/pipeline/pandaxiii_MC
           echo "using just-generated g4 file"
-          restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10
-          restRoot -b -q ../MakeBasicTree.C'("testOutput.root")'
-          restRoot -b -q ../ValidateTrees.C'("validation.root")'
+          restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 10
+          restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")'
+          restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")'
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
           name: PandaTestOutput
-          path: framework/pipeline/pandaxiii_MC/testOutput.root
+          path: framework/pipeline/pandaxiii_MC/Xe136bb0n_processed.root
           retention-days: 1
       - name: PandaXIII Data
         run: |
@@ -282,6 +256,194 @@ jobs:
   examples:
     name: Run examples
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
+    needs: [ framework-install ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: rest-for-physics/framework
+          path: framework
+      - name: Checkout framework branch
+        run: |
+          cd framework
+          ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }}
+      - name: Restore cache
+        uses: actions/cache@v3
+        id: framework-install-cache
+        with:
+          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          path: ${{ env.REST_PATH }}
+      - name: Test Metadata
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd ${{ env.REST_PATH }}/examples
+          restManager --c saveMetadataFile.rml --o meta.root
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: Metadata
+          path: ${{ env.REST_PATH }}/examples/meta.root
+          retention-days: 1
+      - name: 01_NLDBD
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/
+          restG4 NLDBD.rml
+          restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: NLDBD
+          path: ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root
+          retention-days: 1
+      - name: Event Selection
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd framework/pipeline/selection
+          restManager --c g4Analysis.rml --f ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root
+          restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root
+          restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")'
+          restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root
+          restRoot -b -q ValidateIDsFromFile.C'("Run00001_NLDBD_Test_EvSelectionIDsFromFile.root")'
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: EventSelection
+          path: framework/pipeline/selection/IDs.txt
+          retention-days: 1
+      - name: 08_alphas
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd ${{ env.REST_PATH }}/examples/restG4/08.Alphas/
+          mkdir data
+          export REST_ENERGY=5
+          export REST_FOIL=1
+          restG4 alphas.rml
+      #      - name: Upload Artifacts
+      #        uses: actions/upload-artifact@v3
+      #        with:
+      #          name: Alphas
+      #          path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
+      #          retention-days: 1
+      - name: 01_alphaTrack
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd ${{ env.REST_PATH }}/examples/01.alphaTrack/
+          mkdir data
+          export RAW_PROCESSING=ON
+          export HIT_PROCESSING=ON
+          export TRACK_PROCESSING=ON
+          restManager --c processing.rml --f ../restG4/08.Alphas/data/Run_5MeV_1um.root
+          restRoot -b -q Validate.C'("data/Response_5MeV_1um.root")'
+      #       - name: Upload Artifacts
+      #         uses: actions/upload-artifact@v3
+      #         with:
+      #           name: AlphaTrack
+      #           path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
+      #           retention-days: 1
+
+  # Reference dependencies version
+
+  framework-install-reference:
+    name: Build with reference version of dependencies
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build and install
+        uses: ./.github/actions/build
+        with:
+          cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON"
+          branch: ${{ env.BRANCH_NAME }}
+      - name: Test REST
+        run: |
+          printenv
+          cat ${{ env.REST_PATH }}/thisREST.sh
+          source ${{ env.REST_PATH }}/thisREST.sh
+          restManager ListMacros
+          restRoot -b -q
+      - name: Cache framework installation
+        id: framework-install-cache-reference
+        uses: actions/cache@v3
+        with:
+          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          path: ${{ env.REST_PATH }}
+
+
+  pandax-iii-reference:
+    name: "PandaX-III on reference version"
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022
+    needs: [ framework-install-reference ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: rest-for-physics/framework
+          path: framework
+      - name: Checkout framework branch
+        run: |
+          cd framework
+          ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }}
+      - name: Restore cache
+        uses: actions/cache@v3
+        id: framework-install-cache-reference
+        with:
+          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          path: ${{ env.REST_PATH }}
+      - name: 02_PandaXiiiMC
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd framework/pipeline/pandaxiii_MC
+          restG4 Xe136bb0n.rml -o Xe136bb0n.root
+          restRoot -b -q ValidateG4.C'("Xe136bb0n.root")'
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: Xe136bb
+          path: framework/pipeline/pandaxiii_MC/Xe136bb0n.root
+          retention-days: 1
+      - name: PandaXIII Topological
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd framework/pipeline/pandaxiii_MC
+          restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root --j 1 --e 10
+          restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")'
+          restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")'
+          # restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root
+      - name: PandaXIII Topological from Geant4
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd framework/pipeline/pandaxiii_MC
+          echo "using just-generated g4 file"
+          restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 10
+          restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")'
+          restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation_G4_v10.4.3.root")'
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: PandaTestOutput
+          path: framework/pipeline/pandaxiii_MC/Xe136bb0n_processed.root
+          retention-days: 1
+      - name: PandaXIII Data
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd framework/pipeline/pandaxiii_data
+          restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1
+          restRoot -b -q ../MakeBasicTree.C'("testOutput.root")'
+          restRoot -b -q ../ValidateTrees.C'("validation.root")'
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: PandaTriggerRate
+          path: framework/pipeline/pandaxiii_data/TriggerRate.png
+          retention-days: 1
+
+  examples-reference:
+    name: Run examples on reference version
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022
     needs: [ framework-install-reference ]
@@ -329,7 +491,7 @@ jobs:
           cd framework/pipeline/selection
           restManager --c g4Analysis.rml --f ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root
           restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root
-          restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")'
+          restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root", true)'
           restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root
           restRoot -b -q ValidateIDsFromFile.C'("Run00001_NLDBD_Test_EvSelectionIDsFromFile.root")'
       - name: Upload Artifacts
@@ -338,6 +500,17 @@ jobs:
           name: EventSelection
           path: framework/pipeline/selection/IDs.txt
           retention-days: 1
+      - name: 07_decay
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd ${{ env.REST_PATH }}/examples/restG4/07.FullChainDecay/
+          restG4 fullChain.rml -o Run00001_U238_FullChainDecay.root
+          restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'
+          restG4 singleDecay.rml -o Run00002_U238_SingleChainDecay.root
+          restRoot -b -q Validate.C'("Run00002_U238_SingleChainDecay.root", 1)'
+          export REST_ISOTOPE=Be7
+          restG4 singleDecay.rml
+          restRoot -b -q Validate.C'("Run00002_Be7_SingleChainDecay.root", 1)'
       - name: 08_alphas
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c14eb6768..bc56fdafd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
 
 # variables:
 #    GIT_SUBMODULE_STRATEGY: recursive
@@ -32,13 +32,13 @@ stages:
   - examples
 
   # Stage to validate data chain processing constructions (TREX-DM data, PandaX-III topology, etc).
-  - restManager_process
+  - restManager process
 
   # Stage to validate tasks or executions over preprocessed data files
   - postProcessing
 
   # Stage to validate other restManager tasks (metadata generation, script loading, etc).
-  - restManager_generate
+  - restManager generate
 
   # Scripts to launch more complete tests. TRestGas file generation, Geant4 physics validation, etc.
   - deploy
@@ -111,7 +111,7 @@ Build and Install:
     paths:
       - ${CI_PROJECT_DIR}/install
     expire_in: 1 day
-    
+
 Load REST Libraries:
   stage: install
   script:
@@ -126,7 +126,7 @@ List REST Macros:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - restManager ListMacros
 
-01_NLDBD:
+01.NLDBD:
   stage: restG4
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
@@ -139,19 +139,19 @@ List REST Macros:
       - ${CI_PROJECT_DIR}/install/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root
     expire_in: 1 day
 
-02_PandaXiiiMC:
+PandaX-III MC:
   stage: restG4
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC
-    - restG4 Xe136bb0n.rml
-    - restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")'
+    - restG4 Xe136bb0n.rml -o Xe136bb0n.root
+    - restRoot -b -q ValidateG4.C'("Xe136bb0n.root")'
   artifacts:
     paths:
-      - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/Xe136bb0n_n2E06.root
+      - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/Xe136bb0n.root
     expire_in: 1 day
 
-08_alphas:
+08.alphas:
   stage: restG4
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
@@ -165,7 +165,7 @@ List REST Macros:
       - ${CI_PROJECT_DIR}/install/examples/restG4/08.Alphas/data/Run_5MeV_1um.root
     expire_in: 1 day
 
-01_alphaTrack:
+01.alphaTrack:
   stage: examples
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
@@ -225,7 +225,7 @@ Basic Readout:
     - restRoot -b -q BasicValidation.C'("basic.root", "pixelDecoding")'
 
 Test Metadata:
-  stage: restManager_generate
+  stage: restManager generate
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples
@@ -236,7 +236,7 @@ Test Metadata:
     expire_in: 1 day
 
 TREX-DM Latest Data:
-  stage: restManager_process
+  stage: restManager process
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/trex
@@ -254,36 +254,36 @@ TREX-DM Latest Data:
       - ${CI_PROJECT_DIR}/pipeline/trex/Hits_01928.root
     expire_in: 1 day
 
-PandaXIII Topological:
-  stage: restManager_process
+PandaX-III Topological from reference file:
+  stage: restManager process
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC
-    - restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10
-    - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")'
-    - restRoot -b -q ../ValidateTrees.C'("validation.root")'
-    - restManager --c plots.rml --i testOutput.root
+    - restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root --j 1 --e 10
+    - restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")'
+    - restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")'
+    - restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root
   artifacts:
     paths:
       - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/trackParameter.png
     expire_in: 1 week
 
-PandaXIII Topological from Geant4:
-  stage: restManager_process
+PandaX-III Topological from Geant4:
+  stage: restManager process
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC
     - echo "using just-generated g4 file"
-    - restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10
-    - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")'
-    - restRoot -b -q ../ValidateTrees.C'("validation.root")'
+    - restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 10
+    - restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")'
+    - restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")'
   artifacts:
     paths:
-      - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/testOutput.root
+      - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/Xe136bb0n_processed.root
     expire_in: 1 week
 
-PandaXIII Data:
-  stage: restManager_process
+PandaX-III Data:
+  stage: restManager process
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/pandaxiii_data
@@ -296,15 +296,15 @@ PandaXIII Data:
     expire_in: 1 week
 
 Event Selection:
-  stage: restManager_process
+  stage: restManager process
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/selection
     - restManager --c g4Analysis.rml --f "${CI_PROJECT_DIR}/install/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root"
-    
+
     - restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root
     - restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")'
-    
+
     - restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root
     - restRoot -b -q ValidateIDsFromFile.C'("Run00001_NLDBD_Test_EvSelectionIDsFromFile.root")'
 
diff --git a/examples/01.alphaTrack/Validate.C b/examples/01.alphaTrack/Validate.C
index cdba78ea7..5e85ae8d9 100644
--- a/examples/01.alphaTrack/Validate.C
+++ b/examples/01.alphaTrack/Validate.C
@@ -1,11 +1,14 @@
-Int_t Validate(string fname) {
-    TRestRun* run = new TRestRun(fname);
-    cout << "Run entries : " << run->GetEntries() << endl;
-    if (run->GetEntries() < 4350 || run->GetEntries() > 4500) {
-        cout << "The number of entries is not in the range (4350,4500)!" << endl;
+Int_t Validate(const char* filename) {
+    TRestRun run(filename);
+    cout << "Run entries : " << run.GetEntries() << endl;
+
+    constexpr double numberOfEntriesRef = 4551;
+    constexpr double tolerance = 0.05;
+
+    if (TMath::Abs(run.GetEntries() - numberOfEntriesRef) / numberOfEntriesRef > tolerance) {
+        cout << "The number of entries does not match the reference value of " << numberOfEntriesRef << endl;
         return 1;
     }
-    delete run;
 
     cout << "[\033[92m OK \x1b[0m]" << endl;
     return 0;
diff --git a/pipeline/ValidateTrees.C b/pipeline/ValidateTrees.C
index d07bc5a4c..3b44ae166 100644
--- a/pipeline/ValidateTrees.C
+++ b/pipeline/ValidateTrees.C
@@ -5,13 +5,21 @@
 #include <vector>
 
 Int_t ValidateTrees(const char* validationFilename, const char* inputFilename = "results.root") {
-    TFile inputFile(inputFilename);
-    TTree* inputTree = inputFile.Get<TTree>("bTree");
+    TFile* inputFile = TFile::Open(inputFilename);
+    if (inputFile == nullptr) {
+        cout << "Input file '" << inputFilename << " does not exist" << endl;
+        exit(1);
+    }
+    TTree* inputTree = inputFile->Get<TTree>("bTree");
     std::vector<double>* inputObservableVector = 0;
     inputTree->SetBranchAddress("doubleObservables", &inputObservableVector);
 
-    TFile validationFile(validationFilename);
-    TTree* validationTree = validationFile.Get<TTree>("bTree");
+    TFile* validationFile = TFile::Open(validationFilename);
+    if (validationFile == nullptr) {
+        cout << "Validation file '" << validationFilename << " does not exist" << endl;
+        exit(1);
+    }
+    TTree* validationTree = validationFile->Get<TTree>("bTree");
     std::vector<double>* validationObservableVector = 0;
     validationTree->SetBranchAddress("doubleObservables", &validationObservableVector);
 
diff --git a/pipeline/pandaxiii_MC/AllProcesses.rml b/pipeline/pandaxiii_MC/AllProcesses.rml
index 63dab703a..c869f477b 100644
--- a/pipeline/pandaxiii_MC/AllProcesses.rml
+++ b/pipeline/pandaxiii_MC/AllProcesses.rml
@@ -1,65 +1,67 @@
 <?xml version="1.0" ?>
 <TRestManager>
-  <globals>
-    <!-- Environment -->
-    <variable name="REST_PITCH" value="3" overwrite="false" />
-    <parameter name="outputLevel" value="observable" />
-    <!-- Globals proper -->
-    <!--<parameter name="mainDataPath" value="${REST_DATAPATH}" />-->
-    <parameter name="verboseLevel" value="silent" />%options are : silent, warning, info, debug
-    <parameter name="seed" value="5" /> // set to 0 as random seed
-  </globals>
-  <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="silent">
-    <!--<parameter name="inputFile" value="${REST_INPUTFILE}" />-->
-    <parameter name="experimentName" value="PandaX-III" />
-    <!--<parameter name="runType" value="strips_Pitch_${REST_PITCH}mm" />-->
-    <parameter name="runNumber" value="1" />
-    <parameter name="runTag" value="preserve" />
-    <parameter name="runDescription" value="" />
-    <parameter name="user" value="WU" />
-    <parameter name="verboseLevel" value="3" />
-    <parameter name="overwrite" value="off" />
-    <!--<parameter name="outputFile" value="Tracks_[EXPERIMENT]_[USER]_[RUNTYPE]_[RUNTAG]_[RUN]_V[VERSION].root" />-->
-    <parameter name="readOnly" value="true" />
-    <TRestDetectorReadout name="Panda-140kg" file="readout-140kg.rml"/>
-    <TRestDetectorGas type="TRestDetectorGas" name="Xenon-TMA 1Pct 10-10E3Vcm" file="server" pressure="10"/>
-  </TRestRun>
-  <TRestProcessRunner name="pixelization" title="Stripped manager.">
-    <parameter name="outputEventStorage" value="off" />
-    <parameter name="inputEventStorage" value="off" />
-    <parameter name="inputAnalysisStorage" value="off" />
-    <parameter name="firstEntry" value="0" />
-    <parameter name="lastEntry" value="100000000000" />
-    <parameter name="eventsToProcess" value="10" />
-    <!-- ++++++++++++++++
-         Adding processes 
-         ++++++++++++++++ -->
-    <addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestGeant4BlobAnalysisProcess" name="g4Blob" value="OFF" file="processes_2D.rml" />
-    <addProcess type="TRestGeant4ToDetectorHitsProcess" name="G4ToHits" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorElectronDiffusionProcess" name="eDiff_1kVcm_10atm" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorHitsAnalysisProcess" name="hitsAnaDiff" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorHitsSmearingProcess" name="smear_3FWHM" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorHitsAnalysisProcess" name="hitsAnaSmear" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorHitsToSignalProcess" name="hitsToSignal" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorTriggerAnalysisProcess" name="trigger" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorSignalToHitsProcess" name="signalToHits" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorHitsShuffleProcess" name="hitsShuffle" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestDetectorHitsToTrackFastProcess" name="hitsToTrack" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestTrackAnalysisProcess" name="tckAna_2D" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestTrackReductionProcess" name="trackReduction" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestTrackPathMinimizationProcess" name="tckMin" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestTrackDetachIsolatedNodesProcess" name="detach" value="OFF" file="processes_2D.rml" />
-    <addProcess type="TRestTrackReconnectionProcess" name="trackReconnection" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestTrackAnalysisProcess" name="tckAnaFinal_2D" value="ON" file="processes_2D.rml" />
+    <globals>
+        <!-- Environment -->
+        <variable name="REST_PITCH" value="3" overwrite="false"/>
+        <parameter name="outputLevel" value="observable"/>
+        <!-- Globals proper -->
+        <!--<parameter name="mainDataPath" value="${REST_DATAPATH}" />-->
+        <parameter name="verboseLevel" value="silent"/>%options are : silent, warning, info, debug
+        <parameter name="seed" value="5"/>
+        // set to 0 as random seed
+    </globals>
+    <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="silent">
+        <!--<parameter name="inputFile" value="${REST_INPUTFILE}" />-->
+        <parameter name="experimentName" value="PandaX-III"/>
+        <!--<parameter name="runType" value="strips_Pitch_${REST_PITCH}mm" />-->
+        <parameter name="runNumber" value="1"/>
+        <parameter name="runTag" value="preserve"/>
+        <parameter name="runDescription" value=""/>
+        <parameter name="user" value="WU"/>
+        <parameter name="verboseLevel" value="3"/>
+        <parameter name="overwrite" value="off"/>
+        <!--<parameter name="outputFile" value="Tracks_[EXPERIMENT]_[USER]_[RUNTYPE]_[RUNTAG]_[RUN]_V[VERSION].root" />-->
+        <parameter name="readOnly" value="true"/>
+        <TRestDetectorReadout name="Panda-140kg" file="readout-140kg.rml"/>
+        <TRestDetectorGas type="TRestDetectorGas" name="Xenon-TMA 1Pct 10-10E3Vcm" file="server" pressure="10"/>
+    </TRestRun>
+    <TRestProcessRunner name="pixelization" title="Stripped manager.">
+        <parameter name="outputEventStorage" value="off"/>
+        <parameter name="inputEventStorage" value="off"/>
+        <parameter name="inputAnalysisStorage" value="off"/>
+        <parameter name="firstEntry" value="0"/>
+        <parameter name="lastEntry" value="100000000000"/>
+        <parameter name="eventsToProcess" value="10"/>
+        <!-- ++++++++++++++++
+             Adding processes
+             ++++++++++++++++ -->
+        <addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestGeant4BlobAnalysisProcess" name="g4Blob" value="OFF" file="processes_2D.rml"/>
+        <addProcess type="TRestGeant4ToDetectorHitsProcess" name="G4ToHits" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorElectronDiffusionProcess" name="eDiff_1kVcm_10atm" value="ON"
+                    file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorHitsAnalysisProcess" name="hitsAnaDiff" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorHitsSmearingProcess" name="smear_3FWHM" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorHitsAnalysisProcess" name="hitsAnaSmear" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorHitsToSignalProcess" name="hitsToSignal" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorTriggerAnalysisProcess" name="trigger" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorSignalToHitsProcess" name="signalToHits" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorHitsShuffleProcess" name="hitsShuffle" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestDetectorHitsToTrackFastProcess" name="hitsToTrack" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackAnalysisProcess" name="tckAna_2D" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackReductionProcess" name="trackReduction" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackPathMinimizationProcess" name="tckMin" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackDetachIsolatedNodesProcess" name="detach" value="OFF" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackReconnectionProcess" name="trackReconnection" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackAnalysisProcess" name="tckAnaFinal_2D" value="ON" file="processes_2D.rml"/>
 
-    <addProcess type="TRestTrackBlobAnalysisProcess" name="tckBlob_2D" value="ON" file="processes_2D.rml" />
-    <addProcess type="TRestTrackDrawMarkersProcess" name="draw" value="OFF" file="processes_2D.rml"/>
-    <!-- Now we need to define in the manager the tasks we will perform.
-         If task processEvents is not enabled processes will not be launched -->
-    <!-- If analysisPlot is before the processEvents task it will take as input file the input for TRestRun.
-         If it is after processEvents it will take the output of TRestRun. -->
-  </TRestProcessRunner>
-  <addTask type="processEvents" value="ON" />
-  <addTask type="analysisPlot" name="Template" value="OFF" />
+        <addProcess type="TRestTrackBlobAnalysisProcess" name="tckBlob_2D" value="ON" file="processes_2D.rml"/>
+        <addProcess type="TRestTrackDrawMarkersProcess" name="draw" value="OFF" file="processes_2D.rml"/>
+        <!-- Now we need to define in the manager the tasks we will perform.
+             If task processEvents is not enabled processes will not be launched -->
+        <!-- If analysisPlot is before the processEvents task it will take as input file the input for TRestRun.
+             If it is after processEvents it will take the output of TRestRun. -->
+    </TRestProcessRunner>
+    <addTask type="processEvents" value="ON"/>
+    <addTask type="analysisPlot" name="Template" value="OFF"/>
 </TRestManager>
diff --git a/pipeline/pandaxiii_MC/README.md b/pipeline/pandaxiii_MC/README.md
index 0c513ecbf..cd2f7df5c 100644
--- a/pipeline/pandaxiii_MC/README.md
+++ b/pipeline/pandaxiii_MC/README.md
@@ -1,14 +1,15 @@
 The following scripts are used to validate the PandaX-III simulation & topological analysis chain.
 
-step 1: Use Xe136bb0n.rml to tun restG4 for Geant4 simulation. Use ValidateG4.C to check if the simulation 
-goes smoothly. i.e. all 500 events are simulated and metadata is correctly recorded. The output file will 
-be used later on
+- **step 1**: Use `restG4 Xe136bb0n.rml` to run test Geant4 simulation. Use `ValidateG4.C` to check if the simulation
+  produced the expected output. i.e. all 500 events are simulated and metadata is correctly recorded. The output file
+  will be used later on.
 
-step 2: Use AllProcesses.rml to run restManager for REST simulation and topological analysis. processes_2D.rml 
-and readout-140kg.rml is included by it.
+- **step 2**: Use `AllProcesses.rml` to run restManager for REST simulation and topological analysis. `processes_2D.rml`
+  and `readout-140kg.rml` is included by it.
 
-step 3: Use plots.rml to check the plots can be successfully drawn by TRestAnalysisPlot
+- **step 3**: Use `plots.rml` to check the plots can be successfully drawn by TRestAnalysisPlot
+
+File `Xe136bb0n_small_reference.root` corresponds to the file generated by step 1 using Geant4 11.0.2 but with a smaller
+number of simulated events to reduce size. events.
 
-If geant4 version is not 10.4.2, we will use testInput.root instead of the one generated in step 1 as the input 
-of step 2. This file is generated manually with 10.4.2 with only 10 events saved.
 
diff --git a/pipeline/pandaxiii_MC/ValidateG4.C b/pipeline/pandaxiii_MC/ValidateG4.C
index 44efe8173..fdafd62fd 100644
--- a/pipeline/pandaxiii_MC/ValidateG4.C
+++ b/pipeline/pandaxiii_MC/ValidateG4.C
@@ -1,52 +1,52 @@
 
-Int_t ValidateG4(string fname) {
-    TRestRun* run = new TRestRun(fname);
+Int_t ValidateG4(const char* filename) {
+    TRestRun run(filename);
 
-    if (run->GetParentRunNumber() != 0) {
-        cout << "Parent run number value : " << run->GetParentRunNumber() << endl;
+    if (run.GetParentRunNumber() != 0) {
+        cout << "Parent run number value : " << run.GetParentRunNumber() << endl;
         cout << "The parent run number from restG4 generated file should be 0" << endl;
         return 1;
     }
 
-    if (run->GetRunNumber() != 1) {
-        cout << "Run number value : " << run->GetRunNumber() << endl;
+    if (run.GetRunNumber() != 1) {
+        cout << "Run number value : " << run.GetRunNumber() << endl;
         cout << "The run number on the validation chain should be 1 by default!" << endl;
         return 2;
     }
 
-    if (run->GetRunType() != "restG4") {
-        cout << "Run type : " << run->GetRunType() << endl;
+    if (run.GetRunType() != "restG4") {
+        cout << "Run type : " << run.GetRunType() << endl;
         cout << "The run type of restG4 generated data should be 'restG4'!" << endl;
         return 3;
     }
 
-    if (run->GetRunTag() != "SimulationofXe136bb0ndecayfromgas.") {
-        cout << "Run tag : " << run->GetRunTag() << endl;
+    if (run.GetRunTag() != "SimulationofXe136bb0ndecayfromgas.") {
+        cout << "Run tag : " << run.GetRunTag() << endl;
         cout << "The run tag of the basic validation test should be 'NLDBD'!" << endl;
         return 4;
     }
 
-    if (run->GetEntries() != 500) {
-        cout << "Run entries : " << run->GetEntries() << endl;
+    if (run.GetEntries() != 500) {
+        cout << "Run entries : " << run.GetEntries() << endl;
         cout << "The NLDBD simulation is launched from gas. It should always generate 50000 events." << endl;
         return 5;
     }
 
     cout << "Testing reading of Geant4 metadata class" << endl;
-    TRestGeant4Metadata* g4Md = (TRestGeant4Metadata*)run->GetMetadataClass("TRestGeant4Metadata");
-    if (!g4Md) {
+    TRestGeant4Metadata* geant4Metadata = (TRestGeant4Metadata*)run.GetMetadataClass("TRestGeant4Metadata");
+    if (!geant4Metadata) {
         cout << "Problem reading Geant4 metadata class!" << endl;
         return 6;
     }
-    g4Md->PrintMetadata();
+    geant4Metadata->PrintMetadata();
 
-    if (g4Md->GetNumberOfActiveVolumes() != 1) {
+    if (geant4Metadata->GetNumberOfActiveVolumes() != 1) {
         cout << "The number of registered volumes is not 1!" << endl;
         return 7;
     }
 
     // Other tests like opening other metadata classes. Detector TGeoManager, etc.
 
-    cout << "G4 file good" << endl;
+    cout << "Validation passes" << endl;
     return 0;
 }
diff --git a/pipeline/pandaxiii_MC/Xe136bb0n.rml b/pipeline/pandaxiii_MC/Xe136bb0n.rml
index 3ad66e8c5..06de25451 100644
--- a/pipeline/pandaxiii_MC/Xe136bb0n.rml
+++ b/pipeline/pandaxiii_MC/Xe136bb0n.rml
@@ -8,69 +8,67 @@
      from a given volume gas defined in the geometry.ml
  -->
 <restG4>
-  <globals>
-    <parameter name="mainDataPath" value="" />
-    <parameter name="verboseLevel" value="warning" /> %options are : silent, warning, info, debug
-  </globals>
+    <globals>
+        <parameter name="mainDataPath" value=""/>
+        <parameter name="verboseLevel" value="warning"/>
+        %options are : silent, warning, info, debug
+    </globals>
 
-  <TRestRun name="PANDA-X III run" title="Simulations v2.0">
-    <parameter name="experimentName" value="PANDAXIII"/>
-    <parameter name="runNumber" value="1"/>
-    <parameter name="runDescription" value="We launch Xe136bb0n decays from the gas volume."/>
-    <parameter name="user" value="${USER}"/>
-    <parameter name="outputFileName" value="Xe136bb0n_n2E06.root" />
-  </TRestRun>
+    <TRestRun name="PANDA-X III run" title="Simulations v2.0">
+        <parameter name="experimentName" value="PANDAXIII"/>
+        <parameter name="runNumber" value="1"/>
+        <parameter name="runDescription" value="We launch Xe136bb0n decays from the gas volume."/>
+        <parameter name="user" value="${USER}"/>
+        <parameter name="outputFileName" value="Xe136bb0n.root"/>
+    </TRestRun>
 
-  <TRestGeant4Metadata name="restG4 Simulation run" title="Simulation of Xe136bb0n decay from gas.">
-      <!-- <parameter name="nEvents" value="1000000"/>-->
-      <parameter name="nEvents" value="500"/>
-      <parameter name="gdmlFile" value="geometry/main.gdml"/>
-      <parameter name="subEventTimeDelay" value="100us"/>
-      <parameter name="seed" value="1"/>
+    <TRestGeant4Metadata name="restG4 Simulation run" title="Simulation of Xe136bb0n decay from gas.">
+        <parameter name="nEvents" value="500"/>
+        <parameter name="gdmlFile" value="geometry/main.gdml"/>
+        <parameter name="subEventTimeDelay" value="100us"/>
+        <parameter name="seed" value="1"/>
 
-      <generator type="volume" from="Gas">
-          <source use="Xe136bb0n.dat">
-          </source>
-      </generator>
+        <generator type="volume" from="Gas">
+            <source use="Xe136bb0n.dat">
+            </source>
+        </generator>
 
-      <storage sensitiveVolume="Gas">
-          <parameter name="energyRange" value="(0,10)MeV"/>
-      <activeVolume name="Gas" chance="1" maxStepSize="200um" />
-    </storage>
+        <storage sensitiveVolume="Gas">
+            <parameter name="energyRange" value="(0,10)MeV"/>
+            <activeVolume name="Gas" chance="1" maxStepSize="200um"/>
+        </storage>
 
-  </TRestGeant4Metadata>
+    </TRestGeant4Metadata>
 
-  <TRestGeant4PhysicsLists name="default" title="First physics list implementation." >
+    <TRestGeant4PhysicsLists name="default" title="First physics list implementation.">
 
-    <parameter name="cutForGamma" value="10um" />
-    <parameter name="cutForElectron" value="1mm" />
-    <parameter name="cutForPositron" value="1mm" />
+        <parameter name="cutForGamma" value="10um"/>
+        <parameter name="cutForElectron" value="1mm"/>
+        <parameter name="cutForPositron" value="1mm"/>
 
-    <parameter name="cutForMuon" value="1mm" />
-    <parameter name="cutForNeutron" value="1mm" />
-    <parameter name="minEnergyRangeProductionCuts" value="1keV" />
-    <parameter name="maxEnergyRangeProductionCuts" value="1GeV" />
+        <parameter name="cutForMuon" value="1mm"/>
+        <parameter name="cutForNeutron" value="1mm"/>
+        <parameter name="minEnergyRangeProductionCuts" value="1keV"/>
+        <parameter name="maxEnergyRangeProductionCuts" value="1GeV"/>
 
-    <!-- EM Physics lists -->
-    <physicsList name="G4EmLivermorePhysics"> </physicsList>
-    <!-- <physicsList name="G4EmPenelopePhysics"> </physicsList> -->
-    <!-- <physicsList name="G4EmStandardPhysics_option3"> </physicsList> -->
+        <!-- EM Physics lists -->
+        <physicsList name="G4EmLivermorePhysics"/>
 
-    <!-- Decay physics lists -->
-    <physicsList name="G4DecayPhysics"> </physicsList>
-    <physicsList name="G4RadioactiveDecayPhysics"> </physicsList>
-    <physicsList name="G4RadioactiveDecay">
-      <option name="ICM" value="true" />
-      <option name="ARM" value="true" />
-    </physicsList>
+        <!-- Decay physics lists -->
+        <physicsList name="G4DecayPhysics"/>
+        <physicsList name="G4RadioactiveDecayPhysics"/>
+        <physicsList name="G4RadioactiveDecay">
+            <option name="ICM" value="true"/>
+            <option name="ARM" value="true"/>
+        </physicsList>
 
-    <!-- Hadron physics lists -->
-    <physicsList name="G4HadronElasticPhysicsHP"> </physicsList>
-    <physicsList name="G4IonBinaryCascadePhysics"> </physicsList>
-    <physicsList name="G4HadronPhysicsQGSP_BIC_HP"> </physicsList>
-    <physicsList name="G4NeutronTrackingCut"> </physicsList>
-    <physicsList name="G4EmExtraPhysics"> </physicsList>
+        <!-- Hadron physics lists -->
+        <physicsList name="G4HadronElasticPhysicsHP"/>
+        <physicsList name="G4IonBinaryCascadePhysics"/>
+        <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
+        <physicsList name="G4NeutronTrackingCut"/>
+        <physicsList name="G4EmExtraPhysics"/>
 
-  </TRestGeant4PhysicsLists>
+    </TRestGeant4PhysicsLists>
 
 </restG4>
diff --git a/pipeline/pandaxiii_MC/Xe136bb0n_small_reference.root b/pipeline/pandaxiii_MC/Xe136bb0n_small_reference.root
new file mode 100644
index 000000000..db40a66e9
Binary files /dev/null and b/pipeline/pandaxiii_MC/Xe136bb0n_small_reference.root differ
diff --git a/pipeline/pandaxiii_MC/Xe136bb0n_validation.root b/pipeline/pandaxiii_MC/Xe136bb0n_validation.root
new file mode 100644
index 000000000..2759b9b74
Binary files /dev/null and b/pipeline/pandaxiii_MC/Xe136bb0n_validation.root differ
diff --git a/pipeline/pandaxiii_MC/Xe136bb0n_validation_G4_v10.4.3.root b/pipeline/pandaxiii_MC/Xe136bb0n_validation_G4_v10.4.3.root
new file mode 100644
index 000000000..4deb656af
Binary files /dev/null and b/pipeline/pandaxiii_MC/Xe136bb0n_validation_G4_v10.4.3.root differ
diff --git a/pipeline/pandaxiii_MC/validation_6.20.root b/pipeline/pandaxiii_MC/Xe136bb0n_validation_root6.20.root
similarity index 100%
rename from pipeline/pandaxiii_MC/validation_6.20.root
rename to pipeline/pandaxiii_MC/Xe136bb0n_validation_root6.20.root
diff --git a/pipeline/pandaxiii_MC/plots.rml b/pipeline/pandaxiii_MC/plots.rml
index 04eafb350..efc5ec537 100644
--- a/pipeline/pandaxiii_MC/plots.rml
+++ b/pipeline/pandaxiii_MC/plots.rml
@@ -1,77 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 
-<TRestManager name="SpecPlot" title="Example" verboseLevel="info" >
-
-  <TRestRun name="SJTU_Proto" >
-    <parameter name="runNumber" value="-1"/>//change this value to "auto" to enable database
-    <parameter name="outputFileName" value="null"/>//change this value to "auto" to enable database
-  </TRestRun>
-
-  <TRestAnalysisPlot name="restplot" title="Basic Plots">
-
-    <if condition="${USER}==test">
-      <parameter name="previewPlot" value="false"/>
-    </if>
-    <parameter name="previewPlot" value="true"/>
-
-    <canvas size="(1000,800)" divide="(1,2)" save="trackParameter.png"/>
-
-    <plot name="tckBlob" title="energy of track blobs" 
-          xlabel="Blob Energy" ylabel="Counts" logscale="false"
-          legend="on">
-
-      <histo name="lower energy blob, XZ">
-        <variable name="tckBlob_2D_Qlow_X_R20" nbins="100" />
-        <parameter name="lineColor" value="1"/>
-        <parameter name="lineColor" value="1"/>
-      </histo>
-
-      <histo name="lower energy blob, YZ">
-        <variable name="tckBlob_2D_Qlow_Y_R20" nbins="100" />
-        <parameter name="lineColor" value="2"/>
-      </histo>
-
-      <histo name="higher energy blob, XZ">
-        <variable name="tckBlob_2D_Qhigh_X_R20" nbins="100" />
-        <parameter name="lineColor" value="3"/>
-      </histo>
-
-      <histo name="higher energy blob, YZ">
-        <variable name="tckBlob_2D_Qhigh_Y_R20" nbins="100" />
-        <parameter name="lineColor" value="4"/>
-      </histo>
-    </plot>
-
-    <plot name="tckTwist" title="twist parameter of track ending"
-      xlabel="twist" ylabel="Counts" logscale="true"
-      legend="on">
-
-      <histo name="lower energy twist, XZ">
-        <variable name="tckAnaFinal_2D_twistLow_X_20" nbins="100" range="(0,1)"/>
-        <parameter name="lineColor" value="1"/>
-      </histo>
-
-      <histo name="lower energy twist, YZ">
-        <variable name="tckAnaFinal_2D_twistLow_Y_20" nbins="100" />
-        <parameter name="lineColor" value="2"/>
-      </histo>
-
-      <histo name="higher energy twist, XZ">
-        <variable name="tckAnaFinal_2D_twistHigh_X_20" nbins="100" />
-        <parameter name="lineColor" value="3"/>
-      </histo>
-
-      <histo name="higher energy twist, YZ">
-        <variable name="tckAnaFinal_2D_twistHigh_Y_20" nbins="100" />
-        <parameter name="lineColor" value="3"/>
-      </histo>
-    </plot>
-    
-  </TRestAnalysisPlot>
-
-  <addTask command="restplot->PlotCombinedCanvas()" value="ON"/>
+<TRestManager name="SpecPlot" title="Example" verboseLevel="info">
 
-</TRestManager>
+    <TRestRun name="SJTU_Proto">
+        <parameter name="runNumber" value="-1"/>//change this value to "auto" to enable database
+        <parameter name="outputFileName" value="null"/>//change this value to "auto" to enable database
+    </TRestRun>
+
+    <TRestAnalysisPlot name="restplot" title="Basic Plots">
+
+        <if condition="${USER}==test">
+            <parameter name="previewPlot" value="false"/>
+        </if>
+        <parameter name="previewPlot" value="true"/>
+
+        <canvas size="(1000,800)" divide="(1,2)" save="trackParameter.png"/>
+
+        <plot name="tckBlob" title="energy of track blobs"
+              xlabel="Blob Energy" ylabel="Counts" logscale="false"
+              legend="on">
+
+            <histo name="lower energy blob, XZ">
+                <variable name="tckBlob_2D_Qlow_X_R20" nbins="100"/>
+                <parameter name="lineColor" value="1"/>
+                <parameter name="lineColor" value="1"/>
+            </histo>
+
+            <histo name="lower energy blob, YZ">
+                <variable name="tckBlob_2D_Qlow_Y_R20" nbins="100"/>
+                <parameter name="lineColor" value="2"/>
+            </histo>
+
+            <histo name="higher energy blob, XZ">
+                <variable name="tckBlob_2D_Qhigh_X_R20" nbins="100"/>
+                <parameter name="lineColor" value="3"/>
+            </histo>
 
+            <histo name="higher energy blob, YZ">
+                <variable name="tckBlob_2D_Qhigh_Y_R20" nbins="100"/>
+                <parameter name="lineColor" value="4"/>
+            </histo>
+        </plot>
 
-<!--paramater here is accessible to all the classes-->
+        <plot name="tckTwist" title="twist parameter of track ending"
+              xlabel="twist" ylabel="Counts" logscale="true"
+              legend="on">
+
+            <histo name="lower energy twist, XZ">
+                <variable name="tckAnaFinal_2D_twistLow_X_20" nbins="100" range="(0,1)"/>
+                <parameter name="lineColor" value="1"/>
+            </histo>
+
+            <histo name="lower energy twist, YZ">
+                <variable name="tckAnaFinal_2D_twistLow_Y_20" nbins="100"/>
+                <parameter name="lineColor" value="2"/>
+            </histo>
+
+            <histo name="higher energy twist, XZ">
+                <variable name="tckAnaFinal_2D_twistHigh_X_20" nbins="100"/>
+                <parameter name="lineColor" value="3"/>
+            </histo>
+
+            <histo name="higher energy twist, YZ">
+                <variable name="tckAnaFinal_2D_twistHigh_Y_20" nbins="100"/>
+                <parameter name="lineColor" value="3"/>
+            </histo>
+        </plot>
+
+    </TRestAnalysisPlot>
+
+    <addTask command="restplot->PlotCombinedCanvas()" value="ON"/>
+
+</TRestManager>
diff --git a/pipeline/pandaxiii_MC/processes_2D.rml b/pipeline/pandaxiii_MC/processes_2D.rml
index 10cd16847..f36896906 100644
--- a/pipeline/pandaxiii_MC/processes_2D.rml
+++ b/pipeline/pandaxiii_MC/processes_2D.rml
@@ -1,443 +1,458 @@
 <?xml version="1.0" ?>
 <processes>
     <TRestDetectorElectronDiffusionProcess name="eDiff_1kVcm_10atm" title="eDiff" verboseLevel="silent">
-        <parameter name="electricField" value="1" units="kV/cm" />
-        <parameter name="attachment" value="0" />
+        <parameter name="electricField" value="1" units="kV/cm"/>
+        <parameter name="attachment" value="0"/>
         <!-- units?? -->
-        <parameter name="gasPressure" value="10" />
-        <parameter name="Wvalue" value="" units="eV" />
-        <parameter name="maxHits" value="5000" />
+        <parameter name="gasPressure" value="10"/>
+        <parameter name="Wvalue" value="" units="eV"/>
+        <parameter name="maxHits" value="5000"/>
         <!--<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
+        <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>
 
     <TRestDetectorSignalDeconvolutionProcess name="deconvolution-Template" title="Deconvolution of AGET signals">
-        <parameter name="transversalDiffusionCoefficient" value="10" />
+        <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
+        <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>
 
     <TRestDetectorSignalDeconvolutionProcess name="deconv" title="Deconvolution of AGET signals" verboseLevel="silent">
-        <parameter name="frequency1" value="2.71383005928202273" />
-        <parameter name="frequency2" value="18.6067876433914706e" />
-        <parameter name="smoothingPoints" value="3" />
-        <parameter name="smearingPoints" value="5" />
-        <parameter name="baselineStart" value="32" />
-        <parameter name="baselineEnd" value="64" />
-        <parameter name="nFFTStart" value="0" />
-        <parameter name="nFFTEnd" value="0" />
-        <parameter name="cutFrequency" value="12" />
-        <parameter name="responseFile" value="AGET_Response_SJTU_2017Feb22.root" />
+        <parameter name="frequency1" value="2.71383005928202273"/>
+        <parameter name="frequency2" value="18.6067876433914706e"/>
+        <parameter name="smoothingPoints" value="3"/>
+        <parameter name="smearingPoints" value="5"/>
+        <parameter name="baselineStart" value="32"/>
+        <parameter name="baselineEnd" value="64"/>
+        <parameter name="nFFTStart" value="0"/>
+        <parameter name="nFFTEnd" value="0"/>
+        <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
+        <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
+        <parameter name="noiseLevel" value="5"/>// // electrons in each time bin
     </TRestAddSignalNoiseProcess>
 
-    <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" />
+    <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 -->
-        <parameter name="gasPressure" value="" />
+        <parameter name="gasPressure" value=""/>
         <!-- in atm -->
-        <parameter name="driftVelocity" value="" />
+        <parameter name="driftVelocity" value=""/>
         <!-- in cm/us -->
-        <parameter name="method" value="all" />
+        <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" />
+        <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="" />
+        <parameter name="gasPressure" value=""/>
+        <parameter name="driftVelocity" value=""/>
     </TRestDetectorHitsToSignalProcess>
 
     <TRestDetectorHitsToTrackProcess name="ihitsToTrack" title="">
-        <parameter name="clusterDistance" value="7.5" units="mm" />
+        <parameter name="clusterDistance" value="7.5" units="mm"/>
     </TRestDetectorHitsToTrackProcess>
     <TRestDetectorHitsToTrackFastProcess name="hitsToTrack" title="">
-        <parameter name="cellResolution" value="7.5" units="mm" />
-        <parameter name="netSize" value="1700mm" />
-        <parameter name="netOrigin" value="(-850,-850,-850)mm" />
+        <parameter name="cellResolution" value="7.5" units="mm"/>
+        <parameter name="netSize" value="1700mm"/>
+        <parameter name="netOrigin" value="(-850,-850,-850)mm"/>
     </TRestDetectorHitsToTrackFastProcess>
     <TRestDetectorHitsShuffleProcess name="hitsShuffle" title="Shuffles the hits">
-        <parameter name="iterations" value="100" />
+        <parameter name="iterations" value="100"/>
     </TRestDetectorHitsShuffleProcess>
     <TRestDetectorHitsReductionProcess name="hitsReduction" title="Merges the closest hits in a HitsEvent">
-        <parameter name="startingDistance" value="0.25mm" />
-        <parameter name="minimumDistance" value="0.5mm" />
-        <parameter name="distanceStepFactor" value="1.15" />
-        <parameter name="maxNodes" value="25" />
+        <parameter name="startingDistance" value="0.25mm"/>
+        <parameter name="minimumDistance" value="0.5mm"/>
+        <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">
-        <parameter name="startingDistance" value="0.15mm" />
-        <parameter name="minimumDistance" value="0.5mm" />
-        <parameter name="distanceStepFactor" value="1.15" />
-        <parameter name="maxNodes" value="20" />
+    <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"/>
+        <parameter name="maxNodes" value="20"/>
     </TRestTrackReductionProcess>
     <TRestTrackPathMinimizationProcess name="debug" title="" verboseLevel="silent">
-        <parameter name="maxNodes" value="50" />
-        <parameter name="weightHits" value="false" />
+        <parameter name="maxNodes" value="50"/>
+        <parameter name="weightHits" value="false"/>
     </TRestTrackPathMinimizationProcess>
     <TRestTrackPathMinimizationProcess name="tckMin" title="" verboseLevel="silent">
-        <parameter name="maxNodes" value="30" />
-        <parameter name="weightHits" value="false" />
+        <parameter name="maxNodes" value="30"/>
+        <parameter name="weightHits" value="false"/>
     </TRestTrackPathMinimizationProcess>
     <TRestTrackReconnectionProcess name="trackReconnection" title="" verboseLevel="silent">
-        <observable name="branches" type="int" value="ON" />
+        <observable name="branches" type="int" value="ON"/>
         <!-- This parameter will split the track in case secondary branches are found -->
-        <parameter name="splitTrack" value="false" />
+        <parameter name="splitTrack" value="false"/>
     </TRestTrackReconnectionProcess>
     <TRestGeant4AnalysisProcess name="g4Ana" title="Geant4 analysis template" verboseLevel="silent">
-        <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." />
-        <parameter name="lowEnergyCut" value="600keV" />
-        <parameter name="highEnergyCut" value="3000keV" />
+        <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."/>
+        <parameter name="lowEnergyCut" value="600keV"/>
+        <parameter name="highEnergyCut" value="3000keV"/>
     </TRestGeant4AnalysisProcess>
     <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" />
-        <observable name="nHits" value="ON" type="int" />
-        <observable name="nHitsX" value="ON" type="int" />
-        <observable name="nHitsY" value="ON" type="int" />
+        <observable name="energy" value="ON"/>
+        <observable name="xMean" value="ON"/>
+        <observable name="yMean" value="ON"/>
+        <observable name="zMean" value="ON"/>
+        <observable name="nHits" value="ON" type="int"/>
+        <observable name="nHitsX" value="ON" type="int"/>
+        <observable name="nHitsY" value="ON" type="int"/>
         <!-- Observables and parameters to determine if hits are 
          inside a certain fiducial volume (cylinder or prism). -->
         <!-- This parameter allows to enable/disable the cylinder fiducialization. -->
-        <parameter name="cylinderFiducialization" value="false" />
+        <parameter name="cylinderFiducialization" value="false"/>
         <!-- x0 and y0 are common coordinates for prism and cylinder. -->
-        <parameter name="fiducial_x0" value="(0,0,-100)mm" />
-        <parameter name="fiducial_x1" value="(0,0,100)mm" />
-        <parameter name="fiducial_R" value="10mm" />
+        <parameter name="fiducial_x0" value="(0,0,-100)mm"/>
+        <parameter name="fiducial_x1" value="(0,0,100)mm"/>
+        <parameter name="fiducial_R" value="10mm"/>
         <!-- This parameter allows to enable/disable the prism fiducialization. -->
-        <parameter name="prismFiducialization" value="false" />
-        <parameter name="fiducial_sX" value="10mm" />
-        <parameter name="fiducial_sY" value="10mm" />
-        <observable name="isInsidePrismVolume" value="OFF" />
-        <observable name="nInsidePrismVolume" value="OFF" />
-        <observable name="energyInsidePrismVolume" value="OFF" />
-        <observable name="distanceToPrismWall" value="OFF" />
-        <observable name="distanceToPrismTop" value="OFF" />
-        <observable name="distanceToPrismBottom" value="OFF" />
+        <parameter name="prismFiducialization" value="false"/>
+        <parameter name="fiducial_sX" value="10mm"/>
+        <parameter name="fiducial_sY" value="10mm"/>
+        <observable name="isInsidePrismVolume" value="OFF"/>
+        <observable name="nInsidePrismVolume" value="OFF"/>
+        <observable name="energyInsidePrismVolume" value="OFF"/>
+        <observable name="distanceToPrismWall" value="OFF"/>
+        <observable name="distanceToPrismTop" value="OFF"/>
+        <observable name="distanceToPrismBottom" value="OFF"/>
     </TRestDetectorHitsAnalysisProcess>
     <TRestDetectorHitsAnalysisProcess name="hitsAnaSmear" 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" />
-        <observable name="nHits" value="ON" type="int" />
-        <observable name="nHitsX" value="ON" type="int" />
-        <observable name="nHitsY" value="ON" type="int" />
+        <observable name="energy" value="ON"/>
+        <observable name="xMean" value="ON"/>
+        <observable name="yMean" value="ON"/>
+        <observable name="zMean" value="ON"/>
+        <observable name="nHits" value="ON" type="int"/>
+        <observable name="nHitsX" value="ON" type="int"/>
+        <observable name="nHitsY" value="ON" type="int"/>
         <!-- Observables and parameters to determine if hits are 
          inside a certain fiducial volume (cylinder or prism). -->
         <!-- This parameter allows to enable/disable the cylinder fiducialization. -->
-        <parameter name="cylinderFiducialization" value="false" />
+        <parameter name="cylinderFiducialization" value="false"/>
         <!-- x0 and y0 are common coordinates for prism and cylinder. -->
-        <parameter name="fiducial_x0" value="(0,0,-100)mm" />
-        <parameter name="fiducial_x1" value="(0,0,100)mm" />
-        <parameter name="fiducial_R" value="10mm" />
+        <parameter name="fiducial_x0" value="(0,0,-100)mm"/>
+        <parameter name="fiducial_x1" value="(0,0,100)mm"/>
+        <parameter name="fiducial_R" value="10mm"/>
         <!-- This parameter allows to enable/disable the prism fiducialization. -->
-        <parameter name="prismFiducialization" value="false" />
-        <parameter name="fiducial_sX" value="10mm" />
-        <parameter name="fiducial_sY" value="10mm" />
-        <observable name="isInsidePrismVolume" value="OFF" />
-        <observable name="nInsidePrismVolume" value="OFF" />
-        <observable name="energyInsidePrismVolume" value="OFF" />
-        <observable name="distanceToPrismWall" value="OFF" />
-        <observable name="distanceToPrismTop" value="OFF" />
-        <observable name="distanceToPrismBottom" value="OFF" />
+        <parameter name="prismFiducialization" value="false"/>
+        <parameter name="fiducial_sX" value="10mm"/>
+        <parameter name="fiducial_sY" value="10mm"/>
+        <observable name="isInsidePrismVolume" value="OFF"/>
+        <observable name="nInsidePrismVolume" value="OFF"/>
+        <observable name="energyInsidePrismVolume" value="OFF"/>
+        <observable name="distanceToPrismWall" value="OFF"/>
+        <observable name="distanceToPrismTop" value="OFF"/>
+        <observable name="distanceToPrismBottom" value="OFF"/>
     </TRestDetectorHitsAnalysisProcess>
     <TRestDetectorHitsAnalysisProcess name="noSmear" title="Hits analysis template" verboseLevel="silent">
-        <observable name="energy" value="ON" />
+        <observable name="energy" value="ON"/>
     </TRestDetectorHitsAnalysisProcess>
     <TRestDetectorHitsSmearingProcess name="smear" title="Smearing template">
-        <parameter name="energyReference" value="2457.83keV" />
-        <parameter name="resolutionReference" value="4.5" />
+        <parameter name="energyReference" value="2457.83keV"/>
+        <parameter name="resolutionReference" value="4.5"/>
     </TRestDetectorHitsSmearingProcess>
     <TRestDetectorHitsSmearingProcess name="smear_1FWHM" title="Smearing template">
-        <parameter name="energyReference" value="879keV" />
-        <parameter name="resolutionReference" value="5.0" />
+        <parameter name="energyReference" value="879keV"/>
+        <parameter name="resolutionReference" value="5.0"/>
     </TRestDetectorHitsSmearingProcess>
     <TRestDetectorHitsSmearingProcess name="smear_2FWHM" title="Smearing template">
-        <parameter name="energyReference" value="879keV" />
-        <parameter name="resolutionReference" value="5.0" />
+        <parameter name="energyReference" value="879keV"/>
+        <parameter name="resolutionReference" value="5.0"/>
     </TRestDetectorHitsSmearingProcess>
     <TRestDetectorHitsSmearingProcess name="smear_3FWHM" title="Smearing template">
-        <parameter name="energyReference" value="879keV" />
-        <parameter name="resolutionReference" value="5.0" />
+        <parameter name="energyReference" value="879keV"/>
+        <parameter name="resolutionReference" value="5.0"/>
     </TRestDetectorHitsSmearingProcess>
     <TRestDetectorHitsNormalizationProcess name="hitsNorm" title="Hits normalization template">
-        <parameter name="normFactor" value="0.021917" />
+        <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="SecondMaxTrackEnergy" value="ON" description="The energy of the second most energetic track" />
-        <observable name="xMean" value="ON" />
-        <observable name="yMean" value="ON" />
-        <observable name="zMean" value="ON" />
+        <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"/>
+        <observable name="zMean" value="ON"/>
     </TRestTrackAnalysisProcess>
     <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="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."/>
     </TRestTrackAnalysisProcess>
     <TRestTrackAnalysisProcess name="tckVol_2D" title="Track analysis template">
-        <observable name="MaxTrackVolume_X" value="ON" description="" />
-        <observable name="MaxTrackVolume_Y" value="ON" description="" />
+        <observable name="MaxTrackVolume_X" value="ON" description=""/>
+        <observable name="MaxTrackVolume_Y" value="ON" description=""/>
     </TRestTrackAnalysisProcess>
     <TRestTrackAnalysisProcess name="tckAnaFinal_2D" title="Track analysis template" verboseLevel="silent">
-        <observable name="xMean" value="ON" />
-        <observable name="yMean" value="ON" />
-        <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="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="MaxTrackVolume_X" value="ON" description="" />
-        <observable name="MaxTrackVolume_Y" value="ON" description="" />
-        <parameter name="enableTwistParameters" value="true" />
-        <observable name="twistLow_X_5"  value="ON" />
-        <observable name="twistLow_X_10" value="ON" />
-        <observable name="twistLow_X_15" value="ON" />
-        <observable name="twistLow_X_20" value="ON" />
-        <observable name="twistLow_X_25" value="ON" />
-        <observable name="twistLow_X_30" value="ON" />
-        <observable name="twistLow_X_35" value="ON" />
-        <observable name="twistLow_X_45" value="ON" />
-        <observable name="twistHigh_X_15" value="ON" />
-        <observable name="twistHigh_X_20" value="ON" />
-        <observable name="twistHigh_X_25" value="ON" />
-        <observable name="twistHigh_X_30" value="ON" />
-        <observable name="twistHigh_X_35" value="ON" />
-        <observable name="twistHigh_X_45" value="ON" />
-        <observable name="twistBalance_X_15" value="ON" />
-        <observable name="twistBalance_X_20" value="ON" />
-        <observable name="twistBalance_X_25" value="ON" />
-        <observable name="twistBalance_X_30" value="ON" />
-        <observable name="twistBalance_X_35" value="ON" />
-        <observable name="twistBalance_X_45" value="ON" />
-        <observable name="twistRatio_X_15" value="ON" />
-        <observable name="twistRatio_X_20" value="ON" />
-        <observable name="twistRatio_X_25" value="ON" />
-        <observable name="twistRatio_X_30" value="ON" />
-        <observable name="twistRatio_X_35" value="ON" />
-        <observable name="twistRatio_X_45" value="ON" />
-        <observable name="twistLow_Y_15" value="ON" />
-        <observable name="twistLow_Y_20" value="ON" />
-        <observable name="twistLow_Y_25" value="ON" />
-        <observable name="twistLow_Y_30" value="ON" />
-        <observable name="twistLow_Y_35" value="ON" />
-        <observable name="twistLow_Y_45" value="ON" />
-        <observable name="twistHigh_Y_15" value="ON" />
-        <observable name="twistHigh_Y_20" value="ON" />
-        <observable name="twistHigh_Y_25" value="ON" />
-        <observable name="twistHigh_Y_30" value="ON" />
-        <observable name="twistHigh_Y_35" value="ON" />
-        <observable name="twistHigh_Y_45" value="ON" />
-        <observable name="twistBalance_Y_15" value="ON" />
-        <observable name="twistBalance_Y_20" value="ON" />
-        <observable name="twistBalance_Y_25" value="ON" />
-        <observable name="twistBalance_Y_30" value="ON" />
-        <observable name="twistBalance_Y_35" value="ON" />
-        <observable name="twistBalance_Y_45" value="ON" />
-        <observable name="twistRatio_Y_15" value="ON" />
-        <observable name="twistRatio_Y_20" value="ON" />
-        <observable name="twistRatio_Y_25" value="ON" />
-        <observable name="twistRatio_Y_30" value="ON" />
-        <observable name="twistRatio_Y_35" value="ON" />
-        <observable name="twistRatio_Y_45" value="ON" />
+        <observable name="xMean" value="ON"/>
+        <observable name="yMean" value="ON"/>
+        <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="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="MaxTrackVolume_X" value="ON" description=""/>
+        <observable name="MaxTrackVolume_Y" value="ON" description=""/>
+        <parameter name="enableTwistParameters" value="true"/>
+        <observable name="twistLow_X_5" value="ON"/>
+        <observable name="twistLow_X_10" value="ON"/>
+        <observable name="twistLow_X_15" value="ON"/>
+        <observable name="twistLow_X_20" value="ON"/>
+        <observable name="twistLow_X_25" value="ON"/>
+        <observable name="twistLow_X_30" value="ON"/>
+        <observable name="twistLow_X_35" value="ON"/>
+        <observable name="twistLow_X_45" value="ON"/>
+        <observable name="twistHigh_X_15" value="ON"/>
+        <observable name="twistHigh_X_20" value="ON"/>
+        <observable name="twistHigh_X_25" value="ON"/>
+        <observable name="twistHigh_X_30" value="ON"/>
+        <observable name="twistHigh_X_35" value="ON"/>
+        <observable name="twistHigh_X_45" value="ON"/>
+        <observable name="twistBalance_X_15" value="ON"/>
+        <observable name="twistBalance_X_20" value="ON"/>
+        <observable name="twistBalance_X_25" value="ON"/>
+        <observable name="twistBalance_X_30" value="ON"/>
+        <observable name="twistBalance_X_35" value="ON"/>
+        <observable name="twistBalance_X_45" value="ON"/>
+        <observable name="twistRatio_X_15" value="ON"/>
+        <observable name="twistRatio_X_20" value="ON"/>
+        <observable name="twistRatio_X_25" value="ON"/>
+        <observable name="twistRatio_X_30" value="ON"/>
+        <observable name="twistRatio_X_35" value="ON"/>
+        <observable name="twistRatio_X_45" value="ON"/>
+        <observable name="twistLow_Y_15" value="ON"/>
+        <observable name="twistLow_Y_20" value="ON"/>
+        <observable name="twistLow_Y_25" value="ON"/>
+        <observable name="twistLow_Y_30" value="ON"/>
+        <observable name="twistLow_Y_35" value="ON"/>
+        <observable name="twistLow_Y_45" value="ON"/>
+        <observable name="twistHigh_Y_15" value="ON"/>
+        <observable name="twistHigh_Y_20" value="ON"/>
+        <observable name="twistHigh_Y_25" value="ON"/>
+        <observable name="twistHigh_Y_30" value="ON"/>
+        <observable name="twistHigh_Y_35" value="ON"/>
+        <observable name="twistHigh_Y_45" value="ON"/>
+        <observable name="twistBalance_Y_15" value="ON"/>
+        <observable name="twistBalance_Y_20" value="ON"/>
+        <observable name="twistBalance_Y_25" value="ON"/>
+        <observable name="twistBalance_Y_30" value="ON"/>
+        <observable name="twistBalance_Y_35" value="ON"/>
+        <observable name="twistBalance_Y_45" value="ON"/>
+        <observable name="twistRatio_Y_15" value="ON"/>
+        <observable name="twistRatio_Y_20" value="ON"/>
+        <observable name="twistRatio_Y_25" value="ON"/>
+        <observable name="twistRatio_Y_30" value="ON"/>
+        <observable name="twistRatio_Y_35" value="ON"/>
+        <observable name="twistRatio_Y_45" value="ON"/>
     </TRestTrackAnalysisProcess>
     <TRestDetectorTriggerAnalysisProcess name="trigger" title="Trigger analysis template">
-        <observable name="Integral_Eth300" value="ON" />
-        <observable name="Integral_Eth440" value="ON" />
-        <observable name="Integral_Eth850" value="ON" />
-        <observable name="Integral_Eth1229" value="ON" />
-        <observable name="Integral_Eth1900" value="OFF" />
-        <observable name="RawIntegral" value="ON" />
-        <observable name="TriggerStarts" type="int" value="ON" />
+        <observable name="Integral_Eth300" value="ON"/>
+        <observable name="Integral_Eth440" value="ON"/>
+        <observable name="Integral_Eth850" value="ON"/>
+        <observable name="Integral_Eth1229" value="ON"/>
+        <observable name="Integral_Eth1900" value="OFF"/>
+        <observable name="RawIntegral" value="ON"/>
+        <observable name="TriggerStarts" type="int" value="ON"/>
     </TRestDetectorTriggerAnalysisProcess>
     <TRestGeant4BlobAnalysisProcess name="g4Blob" title="Find blobs in DBD. G4 event">
-        <observable name="x1" value="ON" />
-        <observable name="y1" value="ON" />
-        <observable name="z1" value="ON" />
-        <observable name="x2" value="ON" />
-        <observable name="y2" value="ON" />
-        <observable name="z2" value="ON" />
-        <observable name="distance" value="ON" />
-        <observable name="Q1_R5" value="ON" />
-        <observable name="Q1_R10" value="ON" />
-        <observable name="Q1_R15" value="ON" />
-        <observable name="Q1_R12" value="ON" />
-        <observable name="Q2_R5" value="ON" />
-        <observable name="Q2_R10" value="ON" />
-        <observable name="Q2_R15" value="ON" />
-        <observable name="Q2_R12" value="ON" />
+        <observable name="x1" value="ON"/>
+        <observable name="y1" value="ON"/>
+        <observable name="z1" value="ON"/>
+        <observable name="x2" value="ON"/>
+        <observable name="y2" value="ON"/>
+        <observable name="z2" value="ON"/>
+        <observable name="distance" value="ON"/>
+        <observable name="Q1_R5" value="ON"/>
+        <observable name="Q1_R10" value="ON"/>
+        <observable name="Q1_R15" value="ON"/>
+        <observable name="Q1_R12" value="ON"/>
+        <observable name="Q2_R5" value="ON"/>
+        <observable name="Q2_R10" value="ON"/>
+        <observable name="Q2_R15" value="ON"/>
+        <observable name="Q2_R12" value="ON"/>
     </TRestGeant4BlobAnalysisProcess>
-  <TRestTrackBlobAnalysisProcess name="tckBlob_2D" title="Find blobs in the longest track">
-        <observable name="x1_X" value="ON" />
-        <observable name="z1_X" value="ON" />
-        <observable name="x2_X" value="ON" />
-        <observable name="z2_X" value="ON" />
-        <observable name="y1_Y" value="ON" />
-        <observable name="z1_Y" value="ON" />
-        <observable name="y2_Y" value="ON" />
-        <observable name="z2_Y" value="ON" />
-        <observable name="Q1_X_R5" value="ON" />
-        <observable name="Q1_X_R10" value="ON" />
-        <observable name="Q1_X_R15" value="ON" />
-        <observable name="Q1_X_R20" value="ON" />
-        <observable name="Q1_Y_R5" value="ON" />
-        <observable name="Q1_Y_R10" value="ON" />
-        <observable name="Q1_Y_R15" value="ON" />
-        <observable name="Q1_Y_R20" value="ON" />
-        <observable name="Q2_X_R5" value="ON" />
-        <observable name="Q2_X_R10" value="ON" />
-        <observable name="Q2_X_R15" value="ON" />
-        <observable name="Q2_X_R20" value="ON" />
-        <observable name="Q2_Y_R5" value="ON" />
-        <observable name="Q2_Y_R10" value="ON" />
-        <observable name="Q2_Y_R15" value="ON" />
-        <observable name="Q2_Y_R20" value="ON" />
-        <observable name="Qlow_X_R4" value="ON" />
-        <observable name="Qlow_X_R6" value="ON" />
-        <observable name="Qlow_X_R8" value="ON" />
-        <observable name="Qlow_X_R10" value="ON" />
-        <observable name="Qlow_X_R12" value="ON" />
-        <observable name="Qlow_X_R14" value="ON" />
-        <observable name="Qlow_X_R16" value="ON" />
-        <observable name="Qlow_X_R18" value="ON" />
-        <observable name="Qlow_X_R20" value="ON" />
-        <observable name="Qlow_X_R22" value="ON" />
-        <observable name="Qlow_X_R24" value="ON" />
-        <observable name="Qlow_X_R26" value="ON" />
-        <observable name="Qlow_X_R28" value="ON" />
-        <observable name="Qlow_X_R30" value="ON" />
-        <observable name="Qhigh_X_R4" value="ON" />
-        <observable name="Qhigh_X_R6" value="ON" />
-        <observable name="Qhigh_X_R8" value="ON" />
-        <observable name="Qhigh_X_R10" value="ON" />
-        <observable name="Qhigh_X_R12" value="ON" />
-        <observable name="Qhigh_X_R14" value="ON" />
-        <observable name="Qhigh_X_R16" value="ON" />
-        <observable name="Qhigh_X_R18" value="ON" />
-        <observable name="Qhigh_X_R20" value="ON" />
-        <observable name="Qhigh_X_R22" value="ON" />
-        <observable name="Qhigh_X_R24" value="ON" />
-        <observable name="Qhigh_X_R26" value="ON" />
-        <observable name="Qhigh_X_R28" value="ON" />
-        <observable name="Qhigh_X_R30" value="ON" />
-        <observable name="Qlow_Y_R4" value="ON" />
-        <observable name="Qlow_Y_R6" value="ON" />
-        <observable name="Qlow_Y_R8" value="ON" />
-        <observable name="Qlow_Y_R10" value="ON" />
-        <observable name="Qlow_Y_R12" value="ON" />
-        <observable name="Qlow_Y_R14" value="ON" />
-        <observable name="Qlow_Y_R16" value="ON" />
-        <observable name="Qlow_Y_R18" value="ON" />
-        <observable name="Qlow_Y_R20" value="ON" />
-        <observable name="Qlow_Y_R22" value="ON" />
-        <observable name="Qlow_Y_R24" value="ON" />
-        <observable name="Qlow_Y_R26" value="ON" />
-        <observable name="Qlow_Y_R28" value="ON" />
-        <observable name="Qlow_Y_R30" value="ON" />
-        <observable name="Qhigh_Y_R4" value="ON" />
-        <observable name="Qhigh_Y_R6" value="ON" />
-        <observable name="Qhigh_Y_R8" value="ON" />
-        <observable name="Qhigh_Y_R10" value="ON" />
-        <observable name="Qhigh_Y_R12" value="ON" />
-        <observable name="Qhigh_Y_R14" value="ON" />
-        <observable name="Qhigh_Y_R16" value="ON" />
-        <observable name="Qhigh_Y_R18" value="ON" />
-        <observable name="Qhigh_Y_R20" value="ON" />
-        <observable name="Qhigh_Y_R22" value="ON" />
-        <observable name="Qhigh_Y_R24" value="ON" />
-        <observable name="Qhigh_Y_R26" value="ON" />
-        <observable name="Qhigh_Y_R28" value="ON" />
-        <observable name="Qhigh_Y_R30" value="ON" />
-        <observable name="Qbalance_X_R4" value="ON" />
-        <observable name="Qbalance_X_R6" value="ON" />
-        <observable name="Qbalance_X_R8" value="ON" />
-        <observable name="Qbalance_X_R10" value="ON" />
-        <observable name="Qbalance_X_R12" value="ON" />
-        <observable name="Qbalance_X_R14" value="ON" />
-        <observable name="Qbalance_X_R16" value="ON" />
-        <observable name="Qbalance_X_R18" value="ON" />
-        <observable name="Qbalance_X_R20" value="ON" />
-        <observable name="Qbalance_X_R22" value="ON" />
-        <observable name="Qbalance_X_R24" value="ON" />
-        <observable name="Qbalance_X_R26" value="ON" />
-        <observable name="Qbalance_X_R28" value="ON" />
-        <observable name="Qbalance_X_R30" value="ON" />
-        <observable name="Qratio_X_R4" value="ON" />
-        <observable name="Qratio_X_R6" value="ON" />
-        <observable name="Qratio_X_R8" value="ON" />
-        <observable name="Qratio_X_R10" value="ON" />
-        <observable name="Qratio_X_R12" value="ON" />
-        <observable name="Qratio_X_R14" value="ON" />
-        <observable name="Qratio_X_R16" value="ON" />
-        <observable name="Qratio_X_R18" value="ON" />
-        <observable name="Qratio_X_R20" value="ON" />
-        <observable name="Qratio_X_R22" value="ON" />
-        <observable name="Qratio_X_R24" value="ON" />
-        <observable name="Qratio_X_R26" value="ON" />
-        <observable name="Qratio_X_R28" value="ON" />
-        <observable name="Qratio_X_R30" value="ON" />
-        <observable name="Qbalance_Y_R4" value="ON" />
-        <observable name="Qbalance_Y_R6" value="ON" />
-        <observable name="Qbalance_Y_R8" value="ON" />
-        <observable name="Qbalance_Y_R10" value="ON" />
-        <observable name="Qbalance_Y_R12" value="ON" />
-        <observable name="Qbalance_Y_R14" value="ON" />
-        <observable name="Qbalance_Y_R16" value="ON" />
-        <observable name="Qbalance_Y_R18" value="ON" />
-        <observable name="Qbalance_Y_R20" value="ON" />
-        <observable name="Qbalance_Y_R22" value="ON" />
-        <observable name="Qbalance_Y_R24" value="ON" />
-        <observable name="Qbalance_Y_R26" value="ON" />
-        <observable name="Qbalance_Y_R28" value="ON" />
-        <observable name="Qbalance_Y_R30" value="ON" />
-        <observable name="Qratio_Y_R4" value="ON" />
-        <observable name="Qratio_Y_R6" value="ON" />
-        <observable name="Qratio_Y_R8" value="ON" />
-        <observable name="Qratio_Y_R10" value="ON" />
-        <observable name="Qratio_Y_R12" value="ON" />
-        <observable name="Qratio_Y_R14" value="ON" />
-        <observable name="Qratio_Y_R16" value="ON" />
-        <observable name="Qratio_Y_R18" value="ON" />
-        <observable name="Qratio_Y_R20" value="ON" />
-        <observable name="Qratio_Y_R22" value="ON" />
-        <observable name="Qratio_Y_R24" value="ON" />
-        <observable name="Qratio_Y_R26" value="ON" />
-        <observable name="Qratio_Y_R28" value="ON" />
-        <observable name="Qratio_Y_R30" value="ON" />
-        <parameter name="hitsToCheckFraction" value="0.25" />
+    <TRestTrackBlobAnalysisProcess name="tckBlob_2D" title="Find blobs in the longest track">
+        <observable name="x1_X" value="ON"/>
+        <observable name="z1_X" value="ON"/>
+        <observable name="x2_X" value="ON"/>
+        <observable name="z2_X" value="ON"/>
+        <observable name="y1_Y" value="ON"/>
+        <observable name="z1_Y" value="ON"/>
+        <observable name="y2_Y" value="ON"/>
+        <observable name="z2_Y" value="ON"/>
+        <observable name="Q1_X_R5" value="ON"/>
+        <observable name="Q1_X_R10" value="ON"/>
+        <observable name="Q1_X_R15" value="ON"/>
+        <observable name="Q1_X_R20" value="ON"/>
+        <observable name="Q1_Y_R5" value="ON"/>
+        <observable name="Q1_Y_R10" value="ON"/>
+        <observable name="Q1_Y_R15" value="ON"/>
+        <observable name="Q1_Y_R20" value="ON"/>
+        <observable name="Q2_X_R5" value="ON"/>
+        <observable name="Q2_X_R10" value="ON"/>
+        <observable name="Q2_X_R15" value="ON"/>
+        <observable name="Q2_X_R20" value="ON"/>
+        <observable name="Q2_Y_R5" value="ON"/>
+        <observable name="Q2_Y_R10" value="ON"/>
+        <observable name="Q2_Y_R15" value="ON"/>
+        <observable name="Q2_Y_R20" value="ON"/>
+        <observable name="Qlow_X_R4" value="ON"/>
+        <observable name="Qlow_X_R6" value="ON"/>
+        <observable name="Qlow_X_R8" value="ON"/>
+        <observable name="Qlow_X_R10" value="ON"/>
+        <observable name="Qlow_X_R12" value="ON"/>
+        <observable name="Qlow_X_R14" value="ON"/>
+        <observable name="Qlow_X_R16" value="ON"/>
+        <observable name="Qlow_X_R18" value="ON"/>
+        <observable name="Qlow_X_R20" value="ON"/>
+        <observable name="Qlow_X_R22" value="ON"/>
+        <observable name="Qlow_X_R24" value="ON"/>
+        <observable name="Qlow_X_R26" value="ON"/>
+        <observable name="Qlow_X_R28" value="ON"/>
+        <observable name="Qlow_X_R30" value="ON"/>
+        <observable name="Qhigh_X_R4" value="ON"/>
+        <observable name="Qhigh_X_R6" value="ON"/>
+        <observable name="Qhigh_X_R8" value="ON"/>
+        <observable name="Qhigh_X_R10" value="ON"/>
+        <observable name="Qhigh_X_R12" value="ON"/>
+        <observable name="Qhigh_X_R14" value="ON"/>
+        <observable name="Qhigh_X_R16" value="ON"/>
+        <observable name="Qhigh_X_R18" value="ON"/>
+        <observable name="Qhigh_X_R20" value="ON"/>
+        <observable name="Qhigh_X_R22" value="ON"/>
+        <observable name="Qhigh_X_R24" value="ON"/>
+        <observable name="Qhigh_X_R26" value="ON"/>
+        <observable name="Qhigh_X_R28" value="ON"/>
+        <observable name="Qhigh_X_R30" value="ON"/>
+        <observable name="Qlow_Y_R4" value="ON"/>
+        <observable name="Qlow_Y_R6" value="ON"/>
+        <observable name="Qlow_Y_R8" value="ON"/>
+        <observable name="Qlow_Y_R10" value="ON"/>
+        <observable name="Qlow_Y_R12" value="ON"/>
+        <observable name="Qlow_Y_R14" value="ON"/>
+        <observable name="Qlow_Y_R16" value="ON"/>
+        <observable name="Qlow_Y_R18" value="ON"/>
+        <observable name="Qlow_Y_R20" value="ON"/>
+        <observable name="Qlow_Y_R22" value="ON"/>
+        <observable name="Qlow_Y_R24" value="ON"/>
+        <observable name="Qlow_Y_R26" value="ON"/>
+        <observable name="Qlow_Y_R28" value="ON"/>
+        <observable name="Qlow_Y_R30" value="ON"/>
+        <observable name="Qhigh_Y_R4" value="ON"/>
+        <observable name="Qhigh_Y_R6" value="ON"/>
+        <observable name="Qhigh_Y_R8" value="ON"/>
+        <observable name="Qhigh_Y_R10" value="ON"/>
+        <observable name="Qhigh_Y_R12" value="ON"/>
+        <observable name="Qhigh_Y_R14" value="ON"/>
+        <observable name="Qhigh_Y_R16" value="ON"/>
+        <observable name="Qhigh_Y_R18" value="ON"/>
+        <observable name="Qhigh_Y_R20" value="ON"/>
+        <observable name="Qhigh_Y_R22" value="ON"/>
+        <observable name="Qhigh_Y_R24" value="ON"/>
+        <observable name="Qhigh_Y_R26" value="ON"/>
+        <observable name="Qhigh_Y_R28" value="ON"/>
+        <observable name="Qhigh_Y_R30" value="ON"/>
+        <observable name="Qbalance_X_R4" value="ON"/>
+        <observable name="Qbalance_X_R6" value="ON"/>
+        <observable name="Qbalance_X_R8" value="ON"/>
+        <observable name="Qbalance_X_R10" value="ON"/>
+        <observable name="Qbalance_X_R12" value="ON"/>
+        <observable name="Qbalance_X_R14" value="ON"/>
+        <observable name="Qbalance_X_R16" value="ON"/>
+        <observable name="Qbalance_X_R18" value="ON"/>
+        <observable name="Qbalance_X_R20" value="ON"/>
+        <observable name="Qbalance_X_R22" value="ON"/>
+        <observable name="Qbalance_X_R24" value="ON"/>
+        <observable name="Qbalance_X_R26" value="ON"/>
+        <observable name="Qbalance_X_R28" value="ON"/>
+        <observable name="Qbalance_X_R30" value="ON"/>
+        <observable name="Qratio_X_R4" value="ON"/>
+        <observable name="Qratio_X_R6" value="ON"/>
+        <observable name="Qratio_X_R8" value="ON"/>
+        <observable name="Qratio_X_R10" value="ON"/>
+        <observable name="Qratio_X_R12" value="ON"/>
+        <observable name="Qratio_X_R14" value="ON"/>
+        <observable name="Qratio_X_R16" value="ON"/>
+        <observable name="Qratio_X_R18" value="ON"/>
+        <observable name="Qratio_X_R20" value="ON"/>
+        <observable name="Qratio_X_R22" value="ON"/>
+        <observable name="Qratio_X_R24" value="ON"/>
+        <observable name="Qratio_X_R26" value="ON"/>
+        <observable name="Qratio_X_R28" value="ON"/>
+        <observable name="Qratio_X_R30" value="ON"/>
+        <observable name="Qbalance_Y_R4" value="ON"/>
+        <observable name="Qbalance_Y_R6" value="ON"/>
+        <observable name="Qbalance_Y_R8" value="ON"/>
+        <observable name="Qbalance_Y_R10" value="ON"/>
+        <observable name="Qbalance_Y_R12" value="ON"/>
+        <observable name="Qbalance_Y_R14" value="ON"/>
+        <observable name="Qbalance_Y_R16" value="ON"/>
+        <observable name="Qbalance_Y_R18" value="ON"/>
+        <observable name="Qbalance_Y_R20" value="ON"/>
+        <observable name="Qbalance_Y_R22" value="ON"/>
+        <observable name="Qbalance_Y_R24" value="ON"/>
+        <observable name="Qbalance_Y_R26" value="ON"/>
+        <observable name="Qbalance_Y_R28" value="ON"/>
+        <observable name="Qbalance_Y_R30" value="ON"/>
+        <observable name="Qratio_Y_R4" value="ON"/>
+        <observable name="Qratio_Y_R6" value="ON"/>
+        <observable name="Qratio_Y_R8" value="ON"/>
+        <observable name="Qratio_Y_R10" value="ON"/>
+        <observable name="Qratio_Y_R12" value="ON"/>
+        <observable name="Qratio_Y_R14" value="ON"/>
+        <observable name="Qratio_Y_R16" value="ON"/>
+        <observable name="Qratio_Y_R18" value="ON"/>
+        <observable name="Qratio_Y_R20" value="ON"/>
+        <observable name="Qratio_Y_R22" value="ON"/>
+        <observable name="Qratio_Y_R24" value="ON"/>
+        <observable name="Qratio_Y_R26" value="ON"/>
+        <observable name="Qratio_Y_R28" value="ON"/>
+        <observable name="Qratio_Y_R30" value="ON"/>
+        <parameter name="hitsToCheckFraction" value="0.25"/>
     </TRestTrackBlobAnalysisProcess>
     <TRestRawToDetectorSignalProcess name="zS" title="" verboseLevel="silent">
         <!-- These parameters define the integral with threshold. 
@@ -446,28 +461,28 @@
          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="nPointsOverThreshold" value="10" />
-        <parameter name="signalThreshold" value="2.8" />
+        <parameter name="baseLineRange" value="(50,120)"/>
+        <parameter name="zeroSuppression" value="true"/>
+        <parameter name="pointThreshold" value="1.9"/>
+        <parameter name="nPointsOverThreshold" value="10"/>
+        <parameter name="signalThreshold" value="2.8"/>
     </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. -->
-        <parameter name="refreshEvery" value="1" />
+        <parameter name="refreshEvery" value="1"/>
         <!-- This parameter is used to define the baseline calculation -->
-        <parameter name="baseLineRange" value="(50,120)" />
+        <parameter name="baseLineRange" value="(50,120)"/>
         <!-- This parameter is used to define the signal integration window -->
-        <parameter name="integralRange" value="(40,472)" />
+        <parameter name="integralRange" 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.
          minPeakAmplitude : Minimum peak signal amplitude to be considered at all.
         -->
-        <parameter name="pointThreshold" value="1.9" />
-        <parameter name="nPointsOverThreshold" value="10" />
-        <parameter name="signalThreshold" value="2.8" />
+        <parameter name="pointThreshold" value="1.9"/>
+        <parameter name="nPointsOverThreshold" value="10"/>
+        <parameter name="signalThreshold" value="2.8"/>
         <!-- ++++++++++++++++++++++
          Observable definitions
          ++++++++++++++++++++++ -->
@@ -475,97 +490,98 @@
     <observable name="TimeBinsLength" value="ON" />
 -->
         <!-- Event time observables -->
-        <observable name="SecondsFromStart" value="ON" />
-        <observable name="HoursFromStart" value="ON" />
-        <observable name="MeanRate_InHz" value="ON" />
-        <observable name="EventTimeDelay" value="ON" />
+        <observable name="SecondsFromStart" value="ON"/>
+        <observable name="HoursFromStart" value="ON"/>
+        <observable name="MeanRate_InHz" value="ON"/>
+        <observable name="EventTimeDelay" value="ON"/>
         <!-- The numbers of signals that are found inside the event -->
-        <observable name="NumberOfSignals" value="ON" />
+        <observable name="NumberOfSignals" value="ON"/>
         <!-- Number of signals after noisy signals reduction -->
-        <observable name="NumberOfGoodSignals" value="ON" />
+        <observable name="NumberOfGoodSignals" value="ON"/>
         <!-- The baseline average of the signals -->
-        <observable name="BaseLineMean" value="ON" />
+        <observable name="BaseLineMean" value="ON"/>
         <!-- The baseline sigma average of each independent signal -->
-        <observable name="BaseLineSigmaMean" value="ON" />
+        <observable name="BaseLineSigmaMean" value="ON"/>
     </TRestRawSignalAnalysisProcess>
     <!-- The full signal integral in the integralRange -->
     <TRestDetectorAvalancheProcess name="NLDBD" title="1PctGain">
-        <parameter name="energyReference" value="2458keV" />
-        <parameter name="resolutionReference" value="1" />
-        <parameter name="detectorGain" value="1" />
+        <parameter name="energyReference" value="2458keV"/>
+        <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 to shape the signal
+        <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" />
+    <TRestGeant4ToDetectorHitsProcess name="G4ToHits" title="G4Hits to Hits process"/>
     <bambooToRESTProcess name="bambooToREST" title="A process reading bamboo files">
         <!-- Rotation parameter in degrees. It will rotate the original coordinates 
          in the following order RotateX -> RotateY -> RotateZ -->
-        <parameter name="rotation" value="(90,0,0)" />
+        <parameter name="rotation" value="(90,0,0)"/>
     </bambooToRESTProcess>
     <TRestDetectorHitsAnalysisProcess name="bambooAna" title="A Hits analysis from bamboo data.">
-        <observable name="energy" value="ON" />
-        <observable name="xMean" value="ON" />
-        <observable name="yMean" value="ON" />
-        <observable name="zMean" value="ON" />
+        <observable name="energy" value="ON"/>
+        <observable name="xMean" value="ON"/>
+        <observable name="yMean" value="ON"/>
+        <observable name="zMean" value="ON"/>
     </TRestDetectorHitsAnalysisProcess>
-    <TRestTrackDetachIsolatedNodesProcess name="detach" title="Detaching process" verboseLevel="silent" />
+    <TRestTrackDetachIsolatedNodesProcess name="detach" title="Detaching process" verboseLevel="silent"/>
     <TRestTrackLinearizationProcess name="tckLin_2D" title="A track linearization process." verboseLevel="silent">
-        <observable name="coverage_X" value="ON" />
-        <observable name="coverage_Y" value="ON" />
-        <observable name="dEdx_low_X" value="ON" />
-        <observable name="dEdx_high_X" value="ON" />
-        <observable name="dEdx_middle_X" value="ON" />
-        <observable name="dEdx_low_Y" value="ON" />
-        <observable name="dEdx_high_Y" value="ON" />
-        <observable name="dEdx_middle_Y" value="ON" />
-        <observable name="dEdx_Max_low_X" value="ON" />
-        <observable name="dEdx_Max_high_X" value="ON" />
-        <observable name="dEdx_Max_middle_X" value="ON" />
-        <observable name="dEdx_Max_low_Y" value="ON" />
-        <observable name="dEdx_Max_high_Y" value="ON" />
-        <observable name="dEdx_Max_middle_Y" value="ON" />
-        <observable name="Q_low_X" value="ON" />
-        <observable name="Q_high_X" value="ON" />
-        <observable name="Q_middle_X" value="ON" />
-        <observable name="Q_low_Y" value="ON" />
-        <observable name="Q_high_Y" value="ON" />
-        <observable name="Q_middle_Y" value="ON" />
-        <observable name="Q_Peak_low_X" value="ON" />
-        <observable name="Q_Peak_high_X" value="ON" />
-        <observable name="Q_Peak_middle_X" value="ON" />
-        <observable name="Q_Peak_low_Y" value="ON" />
-        <observable name="Q_Peak_high_Y" value="ON" />
-        <observable name="Q_Peak_middle_Y" value="ON" />
-        <observable name="transDiff_X" value="ON" />
-        <observable name="transDiff_Y" value="ON" />
+        <observable name="coverage_X" value="ON"/>
+        <observable name="coverage_Y" value="ON"/>
+        <observable name="dEdx_low_X" value="ON"/>
+        <observable name="dEdx_high_X" value="ON"/>
+        <observable name="dEdx_middle_X" value="ON"/>
+        <observable name="dEdx_low_Y" value="ON"/>
+        <observable name="dEdx_high_Y" value="ON"/>
+        <observable name="dEdx_middle_Y" value="ON"/>
+        <observable name="dEdx_Max_low_X" value="ON"/>
+        <observable name="dEdx_Max_high_X" value="ON"/>
+        <observable name="dEdx_Max_middle_X" value="ON"/>
+        <observable name="dEdx_Max_low_Y" value="ON"/>
+        <observable name="dEdx_Max_high_Y" value="ON"/>
+        <observable name="dEdx_Max_middle_Y" value="ON"/>
+        <observable name="Q_low_X" value="ON"/>
+        <observable name="Q_high_X" value="ON"/>
+        <observable name="Q_middle_X" value="ON"/>
+        <observable name="Q_low_Y" value="ON"/>
+        <observable name="Q_high_Y" value="ON"/>
+        <observable name="Q_middle_Y" value="ON"/>
+        <observable name="Q_Peak_low_X" value="ON"/>
+        <observable name="Q_Peak_high_X" value="ON"/>
+        <observable name="Q_Peak_middle_X" value="ON"/>
+        <observable name="Q_Peak_low_Y" value="ON"/>
+        <observable name="Q_Peak_high_Y" value="ON"/>
+        <observable name="Q_Peak_middle_Y" value="ON"/>
+        <observable name="transDiff_X" value="ON"/>
+        <observable name="transDiff_Y" value="ON"/>
     </TRestTrackLinearizationProcess>
     <TRestTrackDrawMarkersProcess name="draw" title="A track drawing process.">
-        <parameter name="canvasSizeX" value="1000" />
-        <parameter name="canvasSizeY" value="800" />
-        <addMarker x="g4Blob_x1" y="g4Blob_z1" style="4" size="6" color="1" pad="1" />
-        <addMarker x="g4Blob_x2" y="g4Blob_z2" style="4" size="6" color="1" pad="1" />
-        <addMarker x="g4Blob_x1" y="g4Blob_z1" style="29" size="2" color="1" pad="1" />
-        <addMarker x="g4Blob_x2" y="g4Blob_z2" style="29" size="2" color="1" pad="1" />
-        <addMarker x="g4Blob_y1" y="g4Blob_z1" style="4" size="6" color="1" pad="2" />
-        <addMarker x="g4Blob_y2" y="g4Blob_z2" style="4" size="6" color="1" pad="2" />
-        <addMarker x="g4Blob_y1" y="g4Blob_z1" style="29" size="2" color="1" pad="2" />
-        <addMarker x="g4Blob_y2" y="g4Blob_z2" style="29" size="2" color="1" pad="2" />
-        <addMarker x="g4Blob_x1" y="g4Blob_y1" style="4" size="6" color="1" pad="3" />
-        <addMarker x="g4Blob_x2" y="g4Blob_y2" style="4" size="6" color="1" pad="3" />
-        <addMarker x="g4Blob_x1" y="g4Blob_y1" style="29" size="2" color="1" pad="3" />
-        <addMarker x="g4Blob_x2" y="g4Blob_y2" style="29" size="2" color="1" pad="3" />
-        <addMarker x="tckBlob_2D_x1_X" y="tckBlob_2D_z1_X" style="4" size="12" color="4" pad="1" />
-        <addMarker x="tckBlob_2D_x2_X" y="tckBlob_2D_z2_X" style="4" size="12" color="4" pad="1" />
-        <addMarker x="tckBlob_2D_x1_X" y="tckBlob_2D_z1_X" style="5" size="10" color="4" pad="1" />
-        <addMarker x="tckBlob_2D_x2_X" y="tckBlob_2D_z2_X" style="5" size="10" color="4" pad="1" />
-        <addMarker x="tckBlob_2D_y1_Y" y="tckBlob_2D_z1_Y" style="4" size="12" color="4" pad="2" />
-        <addMarker x="tckBlob_2D_y2_Y" y="tckBlob_2D_z2_Y" style="4" size="12" color="4" pad="2" />
-        <addMarker x="tckBlob_2D_y1_Y" y="tckBlob_2D_z1_Y" style="5" size="10" color="4" pad="2" />
-        <addMarker x="tckBlob_2D_y2_Y" y="tckBlob_2D_z2_Y" style="5" size="10" color="4" pad="2" />
-        <addMarker x="tckBlob_2D_x1" y="tckBlob_2D_y1" style="25" size="12" color="4" pad="3" />
-        <addMarker x="tckBlob_2D_x2" y="tckBlob_2D_y2" style="25" size="12" color="4" pad="3" />
-        <addMarker x="tckBlob_2D_x1" y="tckBlob_2D_y1" style="30" size="12" color="4" pad="3" />
-        <addMarker x="tckBlob_2D_x2" y="tckBlob_2D_y2" style="30" size="12" color="4" pad="3" />
+        <parameter name="canvasSizeX" value="1000"/>
+        <parameter name="canvasSizeY" value="800"/>
+        <addMarker x="g4Blob_x1" y="g4Blob_z1" style="4" size="6" color="1" pad="1"/>
+        <addMarker x="g4Blob_x2" y="g4Blob_z2" style="4" size="6" color="1" pad="1"/>
+        <addMarker x="g4Blob_x1" y="g4Blob_z1" style="29" size="2" color="1" pad="1"/>
+        <addMarker x="g4Blob_x2" y="g4Blob_z2" style="29" size="2" color="1" pad="1"/>
+        <addMarker x="g4Blob_y1" y="g4Blob_z1" style="4" size="6" color="1" pad="2"/>
+        <addMarker x="g4Blob_y2" y="g4Blob_z2" style="4" size="6" color="1" pad="2"/>
+        <addMarker x="g4Blob_y1" y="g4Blob_z1" style="29" size="2" color="1" pad="2"/>
+        <addMarker x="g4Blob_y2" y="g4Blob_z2" style="29" size="2" color="1" pad="2"/>
+        <addMarker x="g4Blob_x1" y="g4Blob_y1" style="4" size="6" color="1" pad="3"/>
+        <addMarker x="g4Blob_x2" y="g4Blob_y2" style="4" size="6" color="1" pad="3"/>
+        <addMarker x="g4Blob_x1" y="g4Blob_y1" style="29" size="2" color="1" pad="3"/>
+        <addMarker x="g4Blob_x2" y="g4Blob_y2" style="29" size="2" color="1" pad="3"/>
+        <addMarker x="tckBlob_2D_x1_X" y="tckBlob_2D_z1_X" style="4" size="12" color="4" pad="1"/>
+        <addMarker x="tckBlob_2D_x2_X" y="tckBlob_2D_z2_X" style="4" size="12" color="4" pad="1"/>
+        <addMarker x="tckBlob_2D_x1_X" y="tckBlob_2D_z1_X" style="5" size="10" color="4" pad="1"/>
+        <addMarker x="tckBlob_2D_x2_X" y="tckBlob_2D_z2_X" style="5" size="10" color="4" pad="1"/>
+        <addMarker x="tckBlob_2D_y1_Y" y="tckBlob_2D_z1_Y" style="4" size="12" color="4" pad="2"/>
+        <addMarker x="tckBlob_2D_y2_Y" y="tckBlob_2D_z2_Y" style="4" size="12" color="4" pad="2"/>
+        <addMarker x="tckBlob_2D_y1_Y" y="tckBlob_2D_z1_Y" style="5" size="10" color="4" pad="2"/>
+        <addMarker x="tckBlob_2D_y2_Y" y="tckBlob_2D_z2_Y" style="5" size="10" color="4" pad="2"/>
+        <addMarker x="tckBlob_2D_x1" y="tckBlob_2D_y1" style="25" size="12" color="4" pad="3"/>
+        <addMarker x="tckBlob_2D_x2" y="tckBlob_2D_y2" style="25" size="12" color="4" pad="3"/>
+        <addMarker x="tckBlob_2D_x1" y="tckBlob_2D_y1" style="30" size="12" color="4" pad="3"/>
+        <addMarker x="tckBlob_2D_x2" y="tckBlob_2D_y2" style="30" size="12" color="4" pad="3"/>
     </TRestTrackDrawMarkersProcess>
 </processes>
diff --git a/pipeline/pandaxiii_MC/readout-140kg.rml b/pipeline/pandaxiii_MC/readout-140kg.rml
index 5009ef0e9..e44415e5d 100644
--- a/pipeline/pandaxiii_MC/readout-140kg.rml
+++ b/pipeline/pandaxiii_MC/readout-140kg.rml
@@ -2,128 +2,136 @@
 
 <readouts>
 
-  <globals>
-    <variable name="PITCH" value="3" overwrite="false" />
-    <!-- The pitch value in mm -->
-    <variable name="MODULES" value="10" overwrite="false" />
-    <!-- The number of modules per axis MxM -->
-    <variable name="CHANNELS" value="64" overwrite="false" />
-    <!-- The number of pixels per side PxP -->
-  </globals>
-
-  //The Microbulk MicroMegas
-  <readoutModule name="module" size="((nChannels+1)*pitch-1*pitch/2,(nChannels+1)*pitch-pitch/2-pitch/4)" tolerance="1.e-4" >
-
-    // Y-strips (pixel has fixed x coordinate)
-    <for variable="nCh" from="0" to="nChannels-2" step="1" >
-      <readoutChannel id="${nCh}" type="y">
-        <for variable="nPix" from="0" to="nChannels-1" step="1" >
-          <addPixel id="${nPix}" origin="((1+${nCh})*pitch,pitch/4+${nPix}*pitch)" size="(pixelSize,pixelSize)" rotation="45" />
+    <globals>
+        <variable name="PITCH" value="3" overwrite="false"/>
+        <!-- The pitch value in mm -->
+        <variable name="MODULES" value="10" overwrite="false"/>
+        <!-- The number of modules per axis MxM -->
+        <variable name="CHANNELS" value="64" overwrite="false"/>
+        <!-- The number of pixels per side PxP -->
+    </globals>
+
+    //The Microbulk MicroMegas
+    <readoutModule name="module" size="((nChannels+1)*pitch-1*pitch/2,(nChannels+1)*pitch-pitch/2-pitch/4)"
+                   tolerance="1.e-4">
+
+        // Y-strips (pixel has fixed x coordinate)
+        <for variable="nCh" from="0" to="nChannels-2" step="1">
+            <readoutChannel id="${nCh}" type="y">
+                <for variable="nPix" from="0" to="nChannels-1" step="1">
+                    <addPixel id="${nPix}" origin="((1+${nCh})*pitch,pitch/4+${nPix}*pitch)"
+                              size="(pixelSize,pixelSize)" rotation="45"/>
+                </for>
+                <addPixel id="nChannels" origin="(${nCh}*pitch,pitch/4+(nChannels-1)*pitch+pitch/2)"
+                          size="(pitch+pitch/2,pitch/2)" rotation="0"/>
+            </readoutChannel>
         </for>
-        <addPixel id="nChannels" origin="(${nCh}*pitch,pitch/4+(nChannels-1)*pitch+pitch/2)" size="(pitch+pitch/2,pitch/2)" rotation="0" />
-      </readoutChannel>
-    </for>
-
-    // Last strip is special
-    <readoutChannel id="nChannels-1"  type="y">
-      <for variable="nPix" from="0" to="nChannels-1" step="1" >
-        <addPixel id="${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pixelSize,pixelSize)" rotation="45" />
-        <addPixel id="nChannels+${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pitch/2,pitch)" rotation="0" />
-      </for>
-      <addPixel id="2*nChannels" origin="(nChannels*pitch-pitch/2,pitch/4+(nChannels-1)*pitch+pitch/2)" size="(pitch,pitch/2)" rotation="0" />
-    </readoutChannel>
-
-    // X-strips (pixel has fixed y coordinate)
-
-    // First strip is special
-    <readoutChannel id="nChannels"  type="x">
-      <addPixel id="0" origin="(0,0)" size="(nChannels*pitch+pitch/2,3*pitch/4)" rotation="0" />
-    </readoutChannel>
-
-    <for variable="nCh" from="1" to="nChannels-1" step="1" >
-      <readoutChannel id="nChannels+${nCh}"  type="x">
-        <addPixel id="0" origin="(0,${nCh}*pitch-pitch/4)" size="(pitch/2,pitch)" rotation="0" />
-        <for variable="nPix" from="0" to="nChannels-1" step="1" >
-          <addPixel id="${nPix}+1" origin="((0.5+${nPix})*pitch,${nCh}*pitch-pitch/4)" size="(pixelSize,pixelSize)" rotation="45" />
+
+        // Last strip is special
+        <readoutChannel id="nChannels-1" type="y">
+            <for variable="nPix" from="0" to="nChannels-1" step="1">
+                <addPixel id="${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pixelSize,pixelSize)"
+                          rotation="45"/>
+                <addPixel id="nChannels+${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pitch/2,pitch)"
+                          rotation="0"/>
+            </for>
+            <addPixel id="2*nChannels" origin="(nChannels*pitch-pitch/2,pitch/4+(nChannels-1)*pitch+pitch/2)"
+                      size="(pitch,pitch/2)" rotation="0"/>
+        </readoutChannel>
+
+        // X-strips (pixel has fixed y coordinate)
+
+        // First strip is special
+        <readoutChannel id="nChannels" type="x">
+            <addPixel id="0" origin="(0,0)" size="(nChannels*pitch+pitch/2,3*pitch/4)" rotation="0"/>
+        </readoutChannel>
+
+        <for variable="nCh" from="1" to="nChannels-1" step="1">
+            <readoutChannel id="nChannels+${nCh}" type="x">
+                <addPixel id="0" origin="(0,${nCh}*pitch-pitch/4)" size="(pitch/2,pitch)" rotation="0"/>
+                <for variable="nPix" from="0" to="nChannels-1" step="1">
+                    <addPixel id="${nPix}+1" origin="((0.5+${nPix})*pitch,${nCh}*pitch-pitch/4)"
+                              size="(pixelSize,pixelSize)" rotation="45"/>
+                </for>
+            </readoutChannel>
         </for>
-      </readoutChannel>
-    </for>
-
-  </readoutModule>
-
-<!-- This readout (Panda-140kg) is the latest design of PandaIII detector_2019.5.28-->
- <TRestDetectorReadout name="Panda-140kg" title="PANDA SJTU Jinping readout. 1 plane 52 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels" >
-    <constant name="nChannels" value="${CHANNELS}" />
-    <constant name="pitch" value="${PITCH}" />
-    <constant name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" file="readouts.rml"/>
-
-    <readoutPlane position="(0,0,600.5)mm" planeVector="(0,0,-1)"
-      chargeCollection="1"
-      cathodePosition="(0,0,-601)mm" >
-
-      // 4 modules
-      <for variable="modX" from="1" to="4" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(( (nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-1)) , 3 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 6-modules
-      <for variable="modX" from="5" to="10" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-5)) , 2 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 8-modules
-      <for variable="modX" from="11" to="18" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-11)) , 1 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 8-modules
-      <for variable="modX" from="19" to="26" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-19)) , 0.0 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 8-modules
-      <for variable="modX" from="27" to="34" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-27)) , -1 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 8-modules
-      <for variable="modX" from="35" to="42" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-35)) , -2 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 6-modules
-      <for variable="modX" from="43" to="48" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-43)) , -3 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-      // 4-modules
-      <for variable="modX" from="49" to="52" step="1" >
-        <addReadoutModule id="${modX}" name="module"
-            origin="(((nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-49)) , -4 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-            rotation="0" />
-      </for>
-
-    </readoutPlane>
-
-
-  </TRestDetectorReadout>
+
+    </readoutModule>
+
+    <!-- This readout (Panda-140kg) is the latest design of PandaIII detector_2019.5.28-->
+    <TRestDetectorReadout name="Panda-140kg"
+                          title="PANDA SJTU Jinping readout. 1 plane 52 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels">
+        <constant name="nChannels" value="${CHANNELS}"/>
+        <constant name="pitch" value="${PITCH}"/>
+        <constant name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" file="readouts.rml"/>
+
+        <readoutPlane position="(0,0,600.5)mm" planeVector="(0,0,-1)"
+                      chargeCollection="1"
+                      cathodePosition="(0,0,-601)mm">
+
+            // 4 modules
+            <for variable="modX" from="1" to="4" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(( (nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-1)) , 3 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 6-modules
+            <for variable="modX" from="5" to="10" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-5)) , 2 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 8-modules
+            <for variable="modX" from="11" to="18" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-11)) , 1 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 8-modules
+            <for variable="modX" from="19" to="26" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-19)) , 0.0 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 8-modules
+            <for variable="modX" from="27" to="34" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-27)) , -1 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 8-modules
+            <for variable="modX" from="35" to="42" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-4+(${modX}-35)) , -2 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 6-modules
+            <for variable="modX" from="43" to="48" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-43)) , -3 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+            // 4-modules
+            <for variable="modX" from="49" to="52" step="1">
+                <addReadoutModule id="${modX}" name="module"
+                                  origin="(((nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-49)) , -4 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                  rotation="0"/>
+            </for>
+
+        </readoutPlane>
+
+
+    </TRestDetectorReadout>
 
 </readouts>
diff --git a/pipeline/pandaxiii_MC/readouts.rml b/pipeline/pandaxiii_MC/readouts.rml
index 54b7e7b45..cac55487c 100644
--- a/pipeline/pandaxiii_MC/readouts.rml
+++ b/pipeline/pandaxiii_MC/readouts.rml
@@ -3,328 +3,340 @@
 <readouts>
 
 
-  <globals>
-    <variable name="PITCH" value="3" overwrite="false" />
-    <!-- The pitch value in mm -->
-    <variable name="MODULES" value="10" overwrite="false" />
-    <!-- The number of modules per axis MxM -->
-    <variable name="CHANNELS" value="64" overwrite="false" />
-    <!-- The number of pixels per side PxP -->
-  </globals>
-
-  //The Microbulk MicroMegas
-  <readoutModule name="module" size="((nChannels+1)*pitch-1*pitch/2,(nChannels+1)*pitch-pitch/2-pitch/4)" tolerance="1.e-4" >
-
-    // Y-strips (pixel has fixed x coordinate)
-    <for variable="nCh" from="0" to="nChannels-2" step="1" >
-      <readoutChannel id="${nCh}" type="y">
-        <for variable="nPix" from="0" to="nChannels-1" step="1" >
-          <addPixel id="${nPix}" origin="((1+${nCh})*pitch,pitch/4+${nPix}*pitch)" size="(pixelSize,pixelSize)" rotation="45" />
+    <globals>
+        <variable name="PITCH" value="3" overwrite="false"/>
+        <!-- The pitch value in mm -->
+        <variable name="MODULES" value="10" overwrite="false"/>
+        <!-- The number of modules per axis MxM -->
+        <variable name="CHANNELS" value="64" overwrite="false"/>
+        <!-- The number of pixels per side PxP -->
+    </globals>
+
+    //The Microbulk MicroMegas
+    <readoutModule name="module" size="((nChannels+1)*pitch-1*pitch/2,(nChannels+1)*pitch-pitch/2-pitch/4)"
+                   tolerance="1.e-4">
+
+        // Y-strips (pixel has fixed x coordinate)
+        <for variable="nCh" from="0" to="nChannels-2" step="1">
+            <readoutChannel id="${nCh}" type="y">
+                <for variable="nPix" from="0" to="nChannels-1" step="1">
+                    <addPixel id="${nPix}" origin="((1+${nCh})*pitch,pitch/4+${nPix}*pitch)"
+                              size="(pixelSize,pixelSize)" rotation="45"/>
+                </for>
+                <addPixel id="nChannels" origin="(${nCh}*pitch,pitch/4+(nChannels-1)*pitch+pitch/2)"
+                          size="(pitch+pitch/2,pitch/2)" rotation="0"/>
+            </readoutChannel>
         </for>
-        <addPixel id="nChannels" origin="(${nCh}*pitch,pitch/4+(nChannels-1)*pitch+pitch/2)" size="(pitch+pitch/2,pitch/2)" rotation="0" />
-      </readoutChannel>
-    </for>
-
-    // Last strip is special
-    <readoutChannel id="nChannels-1"  type="y">
-      <for variable="nPix" from="0" to="nChannels-1" step="1" >
-        <addPixel id="${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pixelSize,pixelSize)" rotation="45" />
-        <addPixel id="nChannels+${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pitch/2,pitch)" rotation="0" />
-      </for>
-      <addPixel id="2*nChannels" origin="(nChannels*pitch-pitch/2,pitch/4+(nChannels-1)*pitch+pitch/2)" size="(pitch,pitch/2)" rotation="0" />
-    </readoutChannel>
-
-    // X-strips (pixel has fixed y coordinate)
-
-    // First strip is special
-    <readoutChannel id="nChannels"  type="x">
-      <addPixel id="0" origin="(0,0)" size="(nChannels*pitch+pitch/2,3*pitch/4)" rotation="0" />
-    </readoutChannel>
-
-    <for variable="nCh" from="1" to="nChannels-1" step="1" >
-      <readoutChannel id="nChannels+${nCh}"  type="x">
-        <addPixel id="0" origin="(0,${nCh}*pitch-pitch/4)" size="(pitch/2,pitch)" rotation="0" />
-        <for variable="nPix" from="0" to="nChannels-1" step="1" >
-          <addPixel id="${nPix}+1" origin="((0.5+${nPix})*pitch,${nCh}*pitch-pitch/4)" size="(pixelSize,pixelSize)" rotation="45" />
-        </for>
-      </readoutChannel>
-    </for>
-
-  </readoutModule>
-
-
-  <TRestReadout name="PixelReadout_MxM" title="PIXEL readout ${PITCH}mm-Pitch ${MODULES}x${MODULES} modules ${CHANNELS}+${CHANNELS} channels" >
-    <myParameter name="nChannels" value="${CHANNELS}" />
-    <myParameter name="nModules" value="${MODULES}" />
-    <myParameter name="pitch" value="${PITCH}" />
-    <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" size="(nChannels*pitch,nChannels*pitch)" tolerance="1.e-4" >
-      <for variable="nChX" from="0" to="nChannels-1" step="1" >
-        <for variable="nChY" from="0" to="nChannels-1" step="1" >
-          <readoutChannel id="${nChX}*nChannels + ${nChY}" >
-            <addPixel id="0" origin="(${nChX}*pitch,${nChY}*pitch)" size="(pitch,pitch)" rotation="0" />
-          </readoutChannel>
-        </for>
-      </for>
-    </readoutModule>
-
-
-    <readoutPlane position="(0,0,-990)mm" planeVector="(0,0,1)"
-        chargeCollection="1"
-        cathodePosition="(0,0,0)mm" >
-
-      <for variable="nModX" from="1" to="nModules" step="1" >
-        <for variable="nModY" from="1" to="nModules" step="1" >
-          <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
-              origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
-              rotation="0"  />
-        </for>
-      </for>
-    </readoutPlane>
-
-    <readoutPlane position="(0,0,990)mm" planeVector="(0,0,-1)"
-        chargeCollection="1"
-        cathodePosition="(0,0,0)mm" >
-
-      <for variable="nModX" from="1" to="nModules" step="1" >
-        <for variable="nModY" from="1" to="nModules" step="1" >
-          <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
-              origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
-              rotation="0"  />
-        </for>
-      </for>
-    </readoutPlane>
-
-  </TRestReadout>
-
-  <TRestReadout name="PandaReadout_MxM" title="PANDA readout ${PITCH}mm-Pitch ${MODULES}x${MODULES} modules ${CHANNELS}+${CHANNELS} channels" >
-    <myParameter name="nChannels" value="${CHANNELS}" />
-    <myParameter name="nModules" value="${MODULES}" />
-    <myParameter name="pitch" value="${PITCH}" />
-    <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)" />
 
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" file="readouts.rml"/>
-
-    <readoutPlane position="(0,0,-990)mm" planeVector="(0,0,1)"
-        chargeCollection="1"
-        cathodePosition="(0,0,0)mm" >
-
-      <for variable="nModX" from="1" to="nModules" step="1" >
-        <for variable="nModY" from="1" to="nModules" step="1" >
-          <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
-              origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
-              rotation="0"  />
-        </for>
-      </for>
-    </readoutPlane>
-
-    <readoutPlane position="(0,0,990)mm" planeVector="(0,0,-1)"
-        chargeCollection="1"
-        cathodePosition="(0,0,0)mm" >
-
-      <for variable="nModX" from="1" to="nModules" step="1" >
-        <for variable="nModY" from="1" to="nModules" step="1" >
-          <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
-              origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
-              rotation="0"  />
+        // Last strip is special
+        <readoutChannel id="nChannels-1" type="y">
+            <for variable="nPix" from="0" to="nChannels-1" step="1">
+                <addPixel id="${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pixelSize,pixelSize)"
+                          rotation="45"/>
+                <addPixel id="nChannels+${nPix}" origin="(nChannels*pitch,pitch/4+${nPix}*pitch)" size="(pitch/2,pitch)"
+                          rotation="0"/>
+            </for>
+            <addPixel id="2*nChannels" origin="(nChannels*pitch-pitch/2,pitch/4+(nChannels-1)*pitch+pitch/2)"
+                      size="(pitch,pitch/2)" rotation="0"/>
+        </readoutChannel>
+
+        // X-strips (pixel has fixed y coordinate)
+
+        // First strip is special
+        <readoutChannel id="nChannels" type="x">
+            <addPixel id="0" origin="(0,0)" size="(nChannels*pitch+pitch/2,3*pitch/4)" rotation="0"/>
+        </readoutChannel>
+
+        <for variable="nCh" from="1" to="nChannels-1" step="1">
+            <readoutChannel id="nChannels+${nCh}" type="x">
+                <addPixel id="0" origin="(0,${nCh}*pitch-pitch/4)" size="(pitch/2,pitch)" rotation="0"/>
+                <for variable="nPix" from="0" to="nChannels-1" step="1">
+                    <addPixel id="${nPix}+1" origin="((0.5+${nPix})*pitch,${nCh}*pitch-pitch/4)"
+                              size="(pixelSize,pixelSize)" rotation="45"/>
+                </for>
+            </readoutChannel>
         </for>
-      </for>
-    </readoutPlane>
-
-  </TRestReadout>
-
-  <TRestReadout name="Panda_SJTU_Proto" title="PANDA SJTU Prototype readout. 7 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels" >
-    <myParameter name="nChannels" value="${CHANNELS}" />
-    <myParameter name="pitch" value="${PITCH}" />
-    <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" file="readouts.rml"/>
-
-    <readoutPlane position="(0,0,-170)mm" planeVector="(0,0,1)"
-        chargeCollection="1"
-        cathodePosition="(0,0,170)mm" >
-
-      <addReadoutModule id="1" name="module"
-    origin="(-1*nChannels*pitch,0.5*nChannels*pitch)" rotation="0"  />
-      <addReadoutModule id="1" name="module"
-    origin="(0*nChannels*pitch,0.5*nChannels*pitch)" rotation="0" />
-
-      <addReadoutModule id="3" name="module"
-    origin="(-1.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0"  />
-      <addReadoutModule id="4" name="module"
-    origin="(-0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0"  />
-      <addReadoutModule id="5" name="module"
-    origin="(0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0"  />
-
-      <addReadoutModule id="6" name="module"
-    origin="(-1*nChannels*pitch,-1.5*nChannels*pitch)" rotation="0"  />
-      <addReadoutModule id="7" name="module"
-    origin="(0*nChannels*pitch,-1.5*nChannels*pitch)" rotation="0"  />
-
-    </readoutPlane>
-
-  </TRestReadout>
-
-  <TRestReadout name="SingleAnode" title="Single" >
 
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" size="(2000,2000)" tolerance="1.e-4" >
-      <readoutChannel id="0" >
-        <addPixel id="0" origin="(0,0)" size="(2000,2000)" rotation="0" />
-      </readoutChannel>
     </readoutModule>
 
-    <for variable="plane" from="-1" to="2" step="2" >
-      <readoutPlane position="(0,0,990*${plane})mm" planeVector="(0,0,-1*${plane})"
-          chargeCollection="1" cathodePosition="(0,0,0)mm" >
-        <addReadoutModule id="1" name="module" origin="( -1000 , -1000 )" rotation="0" />
-      </readoutPlane>
-    </for>
-  </TRestReadout>
-
-  <TRestReadout name="Panda-CDR" title="PANDA SJTU Jinping readout. 2 planes 41 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels" >
-    <myParameter name="nChannels" value="${CHANNELS}" />
-    <myParameter name="pitch" value="${PITCH}" />
-    <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" file="readouts.rml"/>
-
-    <for variable="plane" from="-1" to="2" step="2" >
-      <readoutPlane position="(0,0,955*${plane})mm" planeVector="(0,0,-1*${plane})"
-          chargeCollection="1"
-          cathodePosition="(0,0,0)mm" >
-
-        // 4 modules
-        <for variable="modX" from="1" to="4" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(( (nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-1)) , 2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 6-modules
-        <for variable="modX" from="5" to="10" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-5)) , 1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 7-modules
-        <for variable="modX" from="11" to="17" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-11)) , 0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 7-modules
-        <for variable="modX" from="18" to="24" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-18)) , -0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 7-modules
-        <for variable="modX" from="25" to="31" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-25)) , -1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 6-modules
-        <for variable="modX" from="32" to="37" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-32)) , -2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 4-modules
-        <for variable="modX" from="38" to="41" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-38)) , -3.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-      </readoutPlane>
-    </for>
-  </TRestReadout>
-
 
-  <!-- This readout (Panda-Jinping) is validated with the new readoutModule definition.
-	We do the readoutModule definition outside the readoutPlane and
-	then we use addReadoutModule giving the name as reference -->
-
-  <TRestReadout name="Panda-Jinping" title="PANDA SJTU Jinping readout. 2 planes 33 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels" >
-    <myParameter name="nChannels" value="${CHANNELS}" />
-    <myParameter name="pitch" value="${PITCH}" />
-    <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-    <parameter name="mappingNodes" value="0" />
-
-    <readoutModule name="module" file="readouts.rml"/>
-
-    <for variable="plane" from="-1" to="2" step="2" >
-      <readoutPlane position="(0,0,955*${plane})mm" planeVector="(0,0,-1*${plane})"
-          chargeCollection="1"
-          cathodePosition="(0,0,0)mm" >
-
-        // 2 modules
-        <for variable="modX" from="1" to="2" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(( (nChannels+1)*pitch-1*pitch/2)*(-1+(${modX}-1)) , 2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 5-modules
-        <for variable="modX" from="3" to="7" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-2.5+(${modX}-3)) , 1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
+    <TRestReadout name="PixelReadout_MxM"
+                  title="PIXEL readout ${PITCH}mm-Pitch ${MODULES}x${MODULES} modules ${CHANNELS}+${CHANNELS} channels">
+        <myParameter name="nChannels" value="${CHANNELS}"/>
+        <myParameter name="nModules" value="${MODULES}"/>
+        <myParameter name="pitch" value="${PITCH}"/>
+        <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" size="(nChannels*pitch,nChannels*pitch)" tolerance="1.e-4">
+            <for variable="nChX" from="0" to="nChannels-1" step="1">
+                <for variable="nChY" from="0" to="nChannels-1" step="1">
+                    <readoutChannel id="${nChX}*nChannels + ${nChY}">
+                        <addPixel id="0" origin="(${nChX}*pitch,${nChY}*pitch)" size="(pitch,pitch)" rotation="0"/>
+                    </readoutChannel>
+                </for>
+            </for>
+        </readoutModule>
+
+
+        <readoutPlane position="(0,0,-990)mm" planeVector="(0,0,1)"
+                      chargeCollection="1"
+                      cathodePosition="(0,0,0)mm">
+
+            <for variable="nModX" from="1" to="nModules" step="1">
+                <for variable="nModY" from="1" to="nModules" step="1">
+                    <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
+                                      origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
+                                      rotation="0"/>
+                </for>
+            </for>
+        </readoutPlane>
+
+        <readoutPlane position="(0,0,990)mm" planeVector="(0,0,-1)"
+                      chargeCollection="1"
+                      cathodePosition="(0,0,0)mm">
+
+            <for variable="nModX" from="1" to="nModules" step="1">
+                <for variable="nModY" from="1" to="nModules" step="1">
+                    <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
+                                      origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
+                                      rotation="0"/>
+                </for>
+            </for>
+        </readoutPlane>
+
+    </TRestReadout>
+
+    <TRestReadout name="PandaReadout_MxM"
+                  title="PANDA readout ${PITCH}mm-Pitch ${MODULES}x${MODULES} modules ${CHANNELS}+${CHANNELS} channels">
+        <myParameter name="nChannels" value="${CHANNELS}"/>
+        <myParameter name="nModules" value="${MODULES}"/>
+        <myParameter name="pitch" value="${PITCH}"/>
+        <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" file="readouts.rml"/>
+
+        <readoutPlane position="(0,0,-990)mm" planeVector="(0,0,1)"
+                      chargeCollection="1"
+                      cathodePosition="(0,0,0)mm">
+
+            <for variable="nModX" from="1" to="nModules" step="1">
+                <for variable="nModY" from="1" to="nModules" step="1">
+                    <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
+                                      origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
+                                      rotation="0"/>
+                </for>
+            </for>
+        </readoutPlane>
+
+        <readoutPlane position="(0,0,990)mm" planeVector="(0,0,-1)"
+                      chargeCollection="1"
+                      cathodePosition="(0,0,0)mm">
+
+            <for variable="nModX" from="1" to="nModules" step="1">
+                <for variable="nModY" from="1" to="nModules" step="1">
+                    <addReadoutModule id="${nModX}+nModules*(${nModY}-1)-1" name="module"
+                                      origin="((${nModX}-nModules/2-1)*nChannels*pitch,(${nModY}-nModules/2-1)*nChannels*pitch)"
+                                      rotation="0"/>
+                </for>
+            </for>
+        </readoutPlane>
+
+    </TRestReadout>
+
+    <TRestReadout name="Panda_SJTU_Proto"
+                  title="PANDA SJTU Prototype readout. 7 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels">
+        <myParameter name="nChannels" value="${CHANNELS}"/>
+        <myParameter name="pitch" value="${PITCH}"/>
+        <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" file="readouts.rml"/>
+
+        <readoutPlane position="(0,0,-170)mm" planeVector="(0,0,1)"
+                      chargeCollection="1"
+                      cathodePosition="(0,0,170)mm">
+
+            <addReadoutModule id="1" name="module"
+                              origin="(-1*nChannels*pitch,0.5*nChannels*pitch)" rotation="0"/>
+            <addReadoutModule id="1" name="module"
+                              origin="(0*nChannels*pitch,0.5*nChannels*pitch)" rotation="0"/>
+
+            <addReadoutModule id="3" name="module"
+                              origin="(-1.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0"/>
+            <addReadoutModule id="4" name="module"
+                              origin="(-0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0"/>
+            <addReadoutModule id="5" name="module"
+                              origin="(0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0"/>
+
+            <addReadoutModule id="6" name="module"
+                              origin="(-1*nChannels*pitch,-1.5*nChannels*pitch)" rotation="0"/>
+            <addReadoutModule id="7" name="module"
+                              origin="(0*nChannels*pitch,-1.5*nChannels*pitch)" rotation="0"/>
+
+        </readoutPlane>
+
+    </TRestReadout>
+
+    <TRestReadout name="SingleAnode" title="Single">
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" size="(2000,2000)" tolerance="1.e-4">
+            <readoutChannel id="0">
+                <addPixel id="0" origin="(0,0)" size="(2000,2000)" rotation="0"/>
+            </readoutChannel>
+        </readoutModule>
+
+        <for variable="plane" from="-1" to="2" step="2">
+            <readoutPlane position="(0,0,990*${plane})mm" planeVector="(0,0,-1*${plane})"
+                          chargeCollection="1" cathodePosition="(0,0,0)mm">
+                <addReadoutModule id="1" name="module" origin="( -1000 , -1000 )" rotation="0"/>
+            </readoutPlane>
         </for>
-
-        // 6-modules
-        <for variable="modX" from="8" to="13" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-8)) , 0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
+    </TRestReadout>
+
+    <TRestReadout name="Panda-CDR"
+                  title="PANDA SJTU Jinping readout. 2 planes 41 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels">
+        <myParameter name="nChannels" value="${CHANNELS}"/>
+        <myParameter name="pitch" value="${PITCH}"/>
+        <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" file="readouts.rml"/>
+
+        <for variable="plane" from="-1" to="2" step="2">
+            <readoutPlane position="(0,0,955*${plane})mm" planeVector="(0,0,-1*${plane})"
+                          chargeCollection="1"
+                          cathodePosition="(0,0,0)mm">
+
+                // 4 modules
+                <for variable="modX" from="1" to="4" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(( (nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-1)) , 2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 6-modules
+                <for variable="modX" from="5" to="10" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-5)) , 1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 7-modules
+                <for variable="modX" from="11" to="17" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-11)) , 0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 7-modules
+                <for variable="modX" from="18" to="24" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-18)) , -0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 7-modules
+                <for variable="modX" from="25" to="31" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-25)) , -1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 6-modules
+                <for variable="modX" from="32" to="37" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-32)) , -2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 4-modules
+                <for variable="modX" from="38" to="41" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-2+(${modX}-38)) , -3.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+            </readoutPlane>
         </for>
-
-        // 7-modules
-        <for variable="modX" from="14" to="20" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-14)) , -0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 6-modules
-        <for variable="modX" from="21" to="26" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-21)) , -1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 5-modules
-        <for variable="modX" from="27" to="31" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-2.5+(${modX}-27)) , -2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
-        </for>
-
-        // 2-modules
-        <for variable="modX" from="32" to="33" step="1" >
-          <addReadoutModule id="${modX}" name="module"
-              origin="(((nChannels+1)*pitch-1*pitch/2)*(-1+(${modX}-32)) , -3.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
-              rotation="0" />
+    </TRestReadout>
+
+
+    <!-- This readout (Panda-Jinping) is validated with the new readoutModule definition.
+      We do the readoutModule definition outside the readoutPlane and
+      then we use addReadoutModule giving the name as reference -->
+
+    <TRestReadout name="Panda-Jinping"
+                  title="PANDA SJTU Jinping readout. 2 planes 33 modules ${PITCH}mm-Pitch ${CHANNELS}+${CHANNELS} channels">
+        <myParameter name="nChannels" value="${CHANNELS}"/>
+        <myParameter name="pitch" value="${PITCH}"/>
+        <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+
+        <parameter name="mappingNodes" value="0"/>
+
+        <readoutModule name="module" file="readouts.rml"/>
+
+        <for variable="plane" from="-1" to="2" step="2">
+            <readoutPlane position="(0,0,955*${plane})mm" planeVector="(0,0,-1*${plane})"
+                          chargeCollection="1"
+                          cathodePosition="(0,0,0)mm">
+
+                // 2 modules
+                <for variable="modX" from="1" to="2" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(( (nChannels+1)*pitch-1*pitch/2)*(-1+(${modX}-1)) , 2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 5-modules
+                <for variable="modX" from="3" to="7" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-2.5+(${modX}-3)) , 1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 6-modules
+                <for variable="modX" from="8" to="13" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-8)) , 0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 7-modules
+                <for variable="modX" from="14" to="20" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3.5+(${modX}-14)) , -0.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 6-modules
+                <for variable="modX" from="21" to="26" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-3+(${modX}-21)) , -1.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 5-modules
+                <for variable="modX" from="27" to="31" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-2.5+(${modX}-27)) , -2.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+
+                // 2-modules
+                <for variable="modX" from="32" to="33" step="1">
+                    <addReadoutModule id="${modX}" name="module"
+                                      origin="(((nChannels+1)*pitch-1*pitch/2)*(-1+(${modX}-32)) , -3.5 * ((nChannels+1)*pitch-pitch/2-pitch/4) )"
+                                      rotation="0"/>
+                </for>
+            </readoutPlane>
         </for>
-      </readoutPlane>
-    </for>
-  </TRestReadout>
+    </TRestReadout>
 
 </readouts>
\ No newline at end of file
diff --git a/pipeline/pandaxiii_MC/testInput.root b/pipeline/pandaxiii_MC/testInput.root
deleted file mode 100644
index a5ae71e61..000000000
Binary files a/pipeline/pandaxiii_MC/testInput.root and /dev/null differ
diff --git a/pipeline/pandaxiii_MC/validation.root b/pipeline/pandaxiii_MC/validation.root
deleted file mode 100644
index 12cef457e..000000000
Binary files a/pipeline/pandaxiii_MC/validation.root and /dev/null differ
diff --git a/pipeline/selection/Validate.C b/pipeline/selection/Validate.C
index 2ed366658..92c90a336 100644
--- a/pipeline/selection/Validate.C
+++ b/pipeline/selection/Validate.C
@@ -3,30 +3,42 @@
 
 #include <iostream>
 #include <vector>
-Int_t Validate(TString fname) {
-    TFile* f = new TFile(fname);
-    TTree* tr = (TTree*)f->Get("AnalysisTree");
 
-    tr->Scan("eventID:g4Ana_totalEdep:g4Ana_energyPrimary");
+Int_t Validate(const char* filename, const bool isReferenceGeant4Version = false) {
+    TFile* file = TFile::Open(filename);
+    TTree* analysisTree = file->Get<TTree>("AnalysisTree");
 
-    if (tr->GetEntries() != 1) {
+    analysisTree->Scan("eventID:g4Ana_totalEdep:g4Ana_energyPrimary");
+
+    const size_t expectedNumberOfEntries = (!isReferenceGeant4Version) ? 16 : 19;
+
+    if (analysisTree->GetEntries() != expectedNumberOfEntries) {
         cout << "Number of entries is not the same!" << endl;
-        cout << "Expected: 1. Obtained: " << tr->GetEntries() << endl;
+        cout << "Expected: " << expectedNumberOfEntries << ". Obtained: " << analysisTree->GetEntries()
+             << endl;
         return 1;
     }
 
     // Check IDs.
-    std::vector<Int_t> ids = {1};
-    for (Int_t i = 0; i < tr->GetEntries(); i++) {
-        tr->GetEntry(i);
-        if (tr->GetLeaf("eventID")->GetValue(0) != ids[i]) {
+    bool success = true;
+    const std::vector<size_t> ids =
+        (!isReferenceGeant4Version)
+            ? std::vector<size_t>{5, 15, 19, 22, 29, 46, 50, 58, 65, 80, 88, 89, 93, 95, 97, 99}
+            : std::vector<size_t>{7, 8, 10, 13, 14, 15, 17, 19, 25, 27, 37, 44, 55, 58, 77, 84, 90, 92, 94};
+    for (Int_t i = 0; i < analysisTree->GetEntries(); i++) {
+        analysisTree->GetEntry(i);
+        if (analysisTree->GetLeaf("eventID")->GetValue(0) != ids[i]) {
             cout << "Same number of entries but different IDs" << endl;
-            cout << "Found entry " << i << " with ID: " << tr->GetLeaf("eventID")->GetValue(0) << endl;
+            cout << "Found entry " << i << " with ID: " << analysisTree->GetLeaf("eventID")->GetValue(0)
+                 << endl;
             cout << "Expected entry " << i << " with ID: " << ids[i] << endl;
-            return 2;
+            success = false;
         }
     }
+    if (!success) {
+        return 2;
+    }
 
-    cout << "Tree validation sucess!" << endl;
+    cout << "Tree validation success!" << endl;
     return 0;
 }
diff --git a/pipeline/selection/ValidateIDsFromFile.C b/pipeline/selection/ValidateIDsFromFile.C
index c9e832a5c..6996afeab 100644
--- a/pipeline/selection/ValidateIDsFromFile.C
+++ b/pipeline/selection/ValidateIDsFromFile.C
@@ -3,27 +3,35 @@
 
 #include <iostream>
 #include <vector>
-Int_t Validate(TString fname) {
-    TFile* f = new TFile(fname);
-    TTree* tr = (TTree*)f->Get("AnalysisTree");
 
-    if (tr->GetEntries() != 3) {
+Int_t ValidateIDsFromFile(const char* filename) {
+    TFile* file = TFile::Open(filename);
+    TTree* analysisTree = file->Get<TTree>("AnalysisTree");
+
+    constexpr size_t expectedNumberOfEntries = 3;
+    if (analysisTree->GetEntries() != expectedNumberOfEntries) {
         cout << "Number of entries is not the same!" << endl;
-        cout << "Expected: 3. Obtained: " << tr->GetEntries() << endl;
+        cout << "Expected: " << expectedNumberOfEntries << ". Obtained: " << analysisTree->GetEntries()
+             << endl;
         return 1;
     }
 
     // Check IDs.
+    bool success = true;
     std::vector<Int_t> ids = {0, 3, 6};
-    for (Int_t i = 0; i < tr->GetEntries(); i++) {
-        tr->GetEntry(i);
-        if (tr->GetLeaf("eventID")->GetValue(0) != ids[i]) {
+    for (Int_t i = 0; i < analysisTree->GetEntries(); i++) {
+        analysisTree->GetEntry(i);
+        if (analysisTree->GetLeaf("eventID")->GetValue(0) != ids[i]) {
             cout << "Same number of entries but different IDs" << endl;
-            cout << "Found entry " << i << " with ID: " << tr->GetLeaf("eventID")->GetValue(0) << endl;
+            cout << "Found entry " << i << " with ID: " << analysisTree->GetLeaf("eventID")->GetValue(0)
+                 << endl;
             cout << "Expected entry " << i << " with ID: " << ids[i] << endl;
-            return 2;
+            success = false;
         }
     }
+    if (!success) {
+        return 2;
+    }
 
     cout << "Tree validation sucess!" << endl;
     return 0;
diff --git a/pipeline/selection/g4Analysis.rml b/pipeline/selection/g4Analysis.rml
index ce45052a7..3dff4bf0a 100644
--- a/pipeline/selection/g4Analysis.rml
+++ b/pipeline/selection/g4Analysis.rml
@@ -3,34 +3,35 @@
 
 <TRestManager name="RESTManagerSim" title="Template manager to process a simulation generated by restG4.">
 
-  <globals>
-    <parameter name="verboseLevel" value="essential" /> <!--options are : silent(0), essential(1), info(2), debug(3), extreme(4)-->
-    <parameter name="inputFileName" value=""/>
-    <searchPath value="$ENV{REST_INPUTDATA}/definitions/"/>
-  </globals>
-
-  <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="info">
-    <parameter name="experimentName" value="Test"/>
-    <parameter name="runType" value="simulation"/>
-    <parameter name="runNumber" value="-1"/> 
-    <parameter name="runTag" value="preserve"/>
-    <parameter name="runDescription" value=""/>
-    <parameter name="user" value="${USER}"/>
-    <parameter name="verboseLevel" value="2"/>
-    <parameter name="outputFileName" value="Run00001_NLDBD_Test_g4Analysis.root" />
-  </TRestRun>
-
-
-  <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
-    <parameter name="eventsToProcess" value="0" />
-    <parameter name="threadNumber" value="2"/>
- 
-    <addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON" >
-        <parameter name="observable" value="all" />
-    </addProcess>
-
-  </TRestProcessRunner>
-  
-  <addTask type="processEvents" value="ON" />
+    <globals>
+        <parameter name="verboseLevel"
+                   value="essential"/> <!--options are : silent(0), essential(1), info(2), debug(3), extreme(4)-->
+        <parameter name="inputFileName" value=""/>
+        <searchPath value="$ENV{REST_INPUTDATA}/definitions/"/>
+    </globals>
+
+    <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="info">
+        <parameter name="experimentName" value="Test"/>
+        <parameter name="runType" value="simulation"/>
+        <parameter name="runNumber" value="-1"/>
+        <parameter name="runTag" value="preserve"/>
+        <parameter name="runDescription" value=""/>
+        <parameter name="user" value="${USER}"/>
+        <parameter name="verboseLevel" value="2"/>
+        <parameter name="outputFileName" value="Run00001_NLDBD_Test_g4Analysis.root"/>
+    </TRestRun>
+
+
+    <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
+        <parameter name="eventsToProcess" value="0"/>
+        <parameter name="threadNumber" value="2"/>
+
+        <addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON">
+            <parameter name="observable" value="all"/>
+        </addProcess>
+
+    </TRestProcessRunner>
+
+    <addTask type="processEvents" value="ON"/>
 
 </TRestManager>
diff --git a/pipeline/selection/g4EvSelectionIDsFromFile.rml b/pipeline/selection/g4EvSelectionIDsFromFile.rml
index f037a146b..37be16f15 100644
--- a/pipeline/selection/g4EvSelectionIDsFromFile.rml
+++ b/pipeline/selection/g4EvSelectionIDsFromFile.rml
@@ -3,32 +3,34 @@
 
 <TRestManager name="RESTManagerSim" title="Template manager to select events from file.">
 
-  <globals>
-    <parameter name="verboseLevel" value="essential" /> <!--options are : silent(0), essential(1), info(2), debug(3), extreme(4)-->
-    <parameter name="inputFileName" value=""/>
-    <searchPath value="$ENV{REST_INPUTDATA}/definitions/"/>
-  </globals>
-
-  <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="info">
-    <parameter name="experimentName" value="Test"/>
-    <parameter name="runType" value="simulation"/>
-    <parameter name="runNumber" value="-1"/> 
-    <parameter name="runTag" value="preserve"/>
-    <parameter name="runDescription" value=""/>
-    <parameter name="user" value="${USER}"/>
-    <parameter name="verboseLevel" value="2"/>
-    <parameter name="outputFileName" value="Run00001_NLDBD_Test_EvSelectionIDsFromFile.root" />
-  </TRestRun>
-
-
-  <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
-    <parameter name="eventsToProcess" value="0" />
- 
-    
-    <addProcess type="TRestEventSelectionProcess" name="evSelection" fileWithIDs="IDs.txt" value="ON"  verboseLevel="info"/>
-
-  </TRestProcessRunner>
-  
-  <addTask type="processEvents" value="ON" />
+    <globals>
+        <parameter name="verboseLevel"
+                   value="essential"/> <!--options are : silent(0), essential(1), info(2), debug(3), extreme(4)-->
+        <parameter name="inputFileName" value=""/>
+        <searchPath value="$ENV{REST_INPUTDATA}/definitions/"/>
+    </globals>
+
+    <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="info">
+        <parameter name="experimentName" value="Test"/>
+        <parameter name="runType" value="simulation"/>
+        <parameter name="runNumber" value="-1"/>
+        <parameter name="runTag" value="preserve"/>
+        <parameter name="runDescription" value=""/>
+        <parameter name="user" value="${USER}"/>
+        <parameter name="verboseLevel" value="2"/>
+        <parameter name="outputFileName" value="Run00001_NLDBD_Test_EvSelectionIDsFromFile.root"/>
+    </TRestRun>
+
+
+    <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
+        <parameter name="eventsToProcess" value="0"/>
+
+
+        <addProcess type="TRestEventSelectionProcess" name="evSelection" fileWithIDs="IDs.txt" value="ON"
+                    verboseLevel="info"/>
+
+    </TRestProcessRunner>
+
+    <addTask type="processEvents" value="ON"/>
 
 </TRestManager>
\ No newline at end of file
diff --git a/pipeline/selection/g4OnSelection.rml b/pipeline/selection/g4OnSelection.rml
index 10e46dd69..a61e2ca05 100644
--- a/pipeline/selection/g4OnSelection.rml
+++ b/pipeline/selection/g4OnSelection.rml
@@ -3,33 +3,36 @@
 
 <TRestManager name="RESTManagerSim" title="Template manager to select events from file.">
 
-  <globals>
-    <parameter name="verboseLevel" value="essential" /> <!--options are : silent(0), essential(1), info(2), debug(3), extreme(4)-->
-    <parameter name="inputFileName" value=""/>
-    <searchPath value="$ENV{REST_INPUTDATA}/definitions/"/>
-  </globals>
-
-  <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="info">
-    <parameter name="experimentName" value="Test"/>
-    <parameter name="runType" value="simulation"/>
-    <parameter name="runNumber" value="-1"/> 
-    <parameter name="runTag" value="preserve"/>
-    <parameter name="runDescription" value=""/>
-    <parameter name="user" value="${USER}"/>
-    <parameter name="verboseLevel" value="2"/>
-    <parameter name="outputFileName" value="Run00001_NLDBD_Test_EvSelection.root" />
-  </TRestRun>
-
-
-  <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
-    <parameter name="eventsToProcess" value="0" />
- 
-    <addProcess type="TRestEventSelectionProcess" name="evSelection" fileWithIDs="Run00001_NLDBD_Test_g4Analysis.root" conditions="g4Ana_totalEdep<2400 AND g4Ana_energyPrimary>1000" value="ON"  verboseLevel="info"/>
-    
-    <!--<addProcess type="TRestEventSelectionProcess" name="evSelection" fileWithIDs="IDs.txt" value="ON"  verboseLevel="info"/>-->
-
-  </TRestProcessRunner>
-  
-  <addTask type="processEvents" value="ON" />
+    <globals>
+        <parameter name="verboseLevel"
+                   value="essential"/> <!--options are : silent(0), essential(1), info(2), debug(3), extreme(4)-->
+        <parameter name="inputFileName" value=""/>
+        <searchPath value="$ENV{REST_INPUTDATA}/definitions/"/>
+    </globals>
+
+    <TRestRun name="Run metadata" title="REST Metadata run info (template)" verboseLevel="info">
+        <parameter name="experimentName" value="Test"/>
+        <parameter name="runType" value="simulation"/>
+        <parameter name="runNumber" value="-1"/>
+        <parameter name="runTag" value="preserve"/>
+        <parameter name="runDescription" value=""/>
+        <parameter name="user" value="${USER}"/>
+        <parameter name="verboseLevel" value="2"/>
+        <parameter name="outputFileName" value="Run00001_NLDBD_Test_EvSelection.root"/>
+    </TRestRun>
+
+
+    <TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
+        <parameter name="eventsToProcess" value="0"/>
+
+        <addProcess type="TRestEventSelectionProcess" name="evSelection"
+                    fileWithIDs="Run00001_NLDBD_Test_g4Analysis.root"
+                    conditions="g4Ana_totalEdep<2400 AND g4Ana_energyPrimary>1000" value="ON" verboseLevel="info"/>
+
+        <!--<addProcess type="TRestEventSelectionProcess" name="evSelection" fileWithIDs="IDs.txt" value="ON"  verboseLevel="info"/>-->
+
+    </TRestProcessRunner>
+
+    <addTask type="processEvents" value="ON"/>
 
 </TRestManager>
diff --git a/source/framework/core/inc/TRestBrowser.h b/source/framework/core/inc/TRestBrowser.h
index 11038b80c..10af1cba6 100644
--- a/source/framework/core/inc/TRestBrowser.h
+++ b/source/framework/core/inc/TRestBrowser.h
@@ -50,8 +50,8 @@ class TRestBrowser {
     Int_t fEventId = 0;              //!
     Int_t fEventSubId = 0;           //!
 
-    TBrowser* b = nullptr;  //!
-    TRestRun* r = nullptr;  //!
+    TBrowser* fBrowser = nullptr;  //!
+    TRestRun* fRestRun = nullptr;  //!
 #endif
 
    private:
@@ -62,17 +62,17 @@ class TRestBrowser {
     TRestEventViewer* fEventViewer = nullptr;  //!
 
     void SetViewer(TRestEventViewer* eV);
-    void SetViewer(TString viewerName);
+    void SetViewer(const TString& viewerName);
     void SetButtons();
-    Bool_t LoadEventId(Int_t id, Int_t subid = -1);
+    Bool_t LoadEventId(Int_t eventID, Int_t subEventID = -1);
     Bool_t LoadEventEntry(Int_t n);
 #endif
 
    public:
     // tool method
-    void Initialize(TString opt = "FI");
+    void Initialize(const TString& opt = "FI");
     void InitFromConfigFile();
-    Bool_t OpenFile(TString filename);
+    Bool_t OpenFile(const TString& filename);
 
     // setters
     void SetInputEvent(TRestEvent*);
@@ -96,7 +96,7 @@ class TRestBrowser {
 
     // Constructors
     TRestBrowser();
-    TRestBrowser(TString viewerName);
+    TRestBrowser(const TString& viewerName);
 
     // Destructor
     ~TRestBrowser();
diff --git a/source/framework/core/inc/TRestRun.h b/source/framework/core/inc/TRestRun.h
index d88fbc07c..8c6a41047 100644
--- a/source/framework/core/inc/TRestRun.h
+++ b/source/framework/core/inc/TRestRun.h
@@ -124,7 +124,7 @@ class TRestRun : public TRestMetadata {
             RESTWarning << "REST Warning! A null metadata wants to be added in TRestRun!" << RESTendl;
         }
     }
-    void AddEventBranch(TRestEvent* eve);
+    void AddEventBranch(TRestEvent* event);
     void SkipEventTree() {}
 
     void cd() {
@@ -178,8 +178,8 @@ class TRestRun : public TRestMetadata {
     inline TTree* GetEventTree() const { return fEventTree; }
     inline Int_t GetInputFileNumber() const { return fFileProcess == nullptr ? fInputFileNames.size() : 1; }
 
-    TRestMetadata* GetMetadata(const TString& name, TFile* f = nullptr);
-    TRestMetadata* GetMetadataClass(const TString& type, TFile* f = nullptr);
+    TRestMetadata* GetMetadata(const TString& name, TFile* file = nullptr);
+    TRestMetadata* GetMetadataClass(const TString& type, TFile* file = nullptr);
     std::vector<std::string> GetMetadataStructureNames();
     std::vector<std::string> GetMetadataStructureTitles();
     inline int GetNumberOfMetadataStructures() const { return fMetadata.size(); }
diff --git a/source/framework/core/src/TRestBrowser.cxx b/source/framework/core/src/TRestBrowser.cxx
index 3312a6419..d57c25584 100644
--- a/source/framework/core/src/TRestBrowser.cxx
+++ b/source/framework/core/src/TRestBrowser.cxx
@@ -34,12 +34,12 @@ TRestBrowser::TRestBrowser() {
         OpenFile(gDirectory->GetFile()->GetName());
         cout << "Loaded File : " << fInputFileName << endl;
     } else {
-        b = new TBrowser("Browser", 0, "REST Browser");
-        r = new TRestRun();
+        fBrowser = new TBrowser("Browser", nullptr, "REST Browser");
+        fRestRun = new TRestRun();
     }
 }
 
-TRestBrowser::TRestBrowser(TString viewerName) {
+TRestBrowser::TRestBrowser(const TString& viewerName) {
     Initialize("I");
     SetViewer(viewerName);
 }
@@ -49,29 +49,29 @@ TRestBrowser::~TRestBrowser() {
     // delete frmMain;
 }
 
-void TRestBrowser::Initialize(TString opt) {
+void TRestBrowser::Initialize(const TString& opt) {
     pureAnalysis = kFALSE;
 
-    r = new TRestRun();
+    fRestRun = new TRestRun();
 
-    b = new TBrowser("Browser", 0, "REST Browser", opt);
-    TGMainFrame* fr = b->GetBrowserImp()->GetMainFrame();
+    fBrowser = new TBrowser("Browser", 0, "REST Browser", opt);
+    TGMainFrame* fr = fBrowser->GetBrowserImp()->GetMainFrame();
     if (fr == nullptr) {
         RESTWarning << "No x11 interface is available. Cannot call the browser window!" << RESTendl;
         exit(1);
     }
     fr->DontCallClose();
 
-    b->StartEmbedding(0, -1);
+    fBrowser->StartEmbedding(0, -1);
     frmMain = new TGMainFrame(gClient->GetRoot(), 300);
     frmMain->SetCleanup(kDeepCleanup);
     frmMain->SetWindowName("Controller");
     SetButtons();
-    b->StopEmbedding();
+    fBrowser->StopEmbedding();
 
-    b->StartEmbedding(1, -1);
+    fBrowser->StartEmbedding(1, -1);
     fCanDefault = new TCanvas();
-    b->StopEmbedding();
+    fBrowser->StopEmbedding();
     // frmMain->DontCallClose();
     frmMain->MapSubwindows();
     // frmMain->Resize();
@@ -87,12 +87,12 @@ void TRestBrowser::SetViewer(TRestEventViewer* eV) {
     if (eV != nullptr) {
         fEventViewer = eV;
         // b->StartEmbedding(1, -1);
-        eV->Embed(b);
+        eV->Embed(fBrowser);
         // b->StopEmbedding();
     }
 }
 
-void TRestBrowser::SetViewer(TString viewerName) {
+void TRestBrowser::SetViewer(const TString& viewerName) {
     if (Count((string)viewerName, "Viewer") > 0) {
         TRestEventViewer* viewer = REST_Reflection::Assembly((string)viewerName);
         if (viewer != nullptr) {
@@ -112,86 +112,86 @@ void TRestBrowser::SetViewer(TString viewerName) {
 void TRestBrowser::SetButtons() {
     TString icondir = (TString)getenv("ROOTSYS") + "/icons/";
 
-    auto fVFrame = new TGVerticalFrame(frmMain);
-    fVFrame->Resize(300, 200);
+    auto vFrame = new TGVerticalFrame(frmMain);
+    vFrame->Resize(300, 200);
 
     // row in the tree
-    fEventRowLabel = new TGLabel(fVFrame, "Entry:");
-    fVFrame->AddFrame(fEventRowLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    fEventRowLabel = new TGLabel(vFrame, "Entry:");
+    vFrame->AddFrame(fEventRowLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    fEventRowNumberBox = new TGNumberEntry(fVFrame, fEventRow);
+    fEventRowNumberBox = new TGNumberEntry(vFrame, fEventRow);
     fEventRowNumberBox->Connect("ValueSet(Long_t)", "TRestBrowser", this, "RowValueChangedAction(Long_t)");
-    fVFrame->AddFrame(fEventRowNumberBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(fEventRowNumberBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
     // event id and sub event id
-    auto labelbar = new TGHorizontalFrame(fVFrame);
+    auto labelBar = new TGHorizontalFrame(vFrame);
     {
-        fEventIdLabel = new TGLabel(labelbar, "Event ID:");
-        labelbar->AddFrame(fEventIdLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        fEventIdLabel = new TGLabel(labelBar, "Event ID:");
+        labelBar->AddFrame(fEventIdLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-        fEventSubIdLabel = new TGLabel(labelbar, "Sub ID:");
-        labelbar->AddFrame(fEventSubIdLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        fEventSubIdLabel = new TGLabel(labelBar, "Sub ID:");
+        labelBar->AddFrame(fEventSubIdLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
     }
-    fVFrame->AddFrame(labelbar, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(labelBar, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    auto numberboxbar = new TGHorizontalFrame(fVFrame);
+    auto numberBoxBar = new TGHorizontalFrame(vFrame);
     {
-        fEventIdNumberBox = new TGNumberEntry(numberboxbar, fEventId);
+        fEventIdNumberBox = new TGNumberEntry(numberBoxBar, fEventId);
         fEventIdNumberBox->Connect("ValueSet(Long_t)", "TRestBrowser", this, "IdValueChangedAction(Long_t)");
-        numberboxbar->AddFrame(fEventIdNumberBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        numberBoxBar->AddFrame(fEventIdNumberBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-        fEventSubIdNumberBox = new TGNumberEntry(numberboxbar, fEventSubId);
+        fEventSubIdNumberBox = new TGNumberEntry(numberBoxBar, fEventSubId);
         fEventSubIdNumberBox->Connect("ValueSet(Long_t)", "TRestBrowser", this,
                                       "IdValueChangedAction(Long_t)");
-        numberboxbar->AddFrame(fEventSubIdNumberBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        numberBoxBar->AddFrame(fEventSubIdNumberBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
     }
-    fVFrame->AddFrame(numberboxbar, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(numberBoxBar, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
     // event type to choose
-    fEventTypeLabel = new TGLabel(fVFrame, "Event Type:");
-    fVFrame->AddFrame(fEventTypeLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    fEventTypeLabel = new TGLabel(vFrame, "Event Type:");
+    vFrame->AddFrame(fEventTypeLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    fEventTypeComboBox = new TGComboBox(fVFrame);
+    fEventTypeComboBox = new TGComboBox(vFrame);
     fEventTypeComboBox->Connect("Selected(Int_t)", "TRestBrowser", this, "EventTypeChangedAction(Int_t)");
-    fVFrame->AddFrame(fEventTypeComboBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(fEventTypeComboBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
     // plot option buttons
-    fPlotOptionLabel = new TGLabel(fVFrame, "Plot Options:");
-    fVFrame->AddFrame(fPlotOptionLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    fPlotOptionLabel = new TGLabel(vFrame, "Plot Options:");
+    vFrame->AddFrame(fPlotOptionLabel, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    fPlotOptionTextBox = new TGTextEntry(fVFrame, "");
+    fPlotOptionTextBox = new TGTextEntry(vFrame, "");
     fPlotOptionTextBox->SetText("");
     fPlotOptionTextBox->Connect("ReturnPressed()", "TRestBrowser", this, "PlotAction()");
-    fVFrame->AddFrame(fPlotOptionTextBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(fPlotOptionTextBox, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    auto switchbuttonbar = new TGHorizontalFrame(fVFrame);
+    auto switchButtonBar = new TGHorizontalFrame(vFrame);
     {
-        fButOptPrev = new TGTextButton(switchbuttonbar, "<<Previous");  ///< Load Event button
+        fButOptPrev = new TGTextButton(switchButtonBar, "<<Previous");  ///< Load Event button
         fButOptPrev->Connect("Clicked()", "TRestBrowser", this, "PreviousPlotOptionAction()");
-        switchbuttonbar->AddFrame(fButOptPrev, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        switchButtonBar->AddFrame(fButOptPrev, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-        fButOptRefresh = new TGTextButton(switchbuttonbar, "Plot");  ///< Load Event button
+        fButOptRefresh = new TGTextButton(switchButtonBar, "Plot");  ///< Load Event button
         fButOptRefresh->Connect("Clicked()", "TRestBrowser", this, "PlotAction()");
-        switchbuttonbar->AddFrame(fButOptRefresh, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        switchButtonBar->AddFrame(fButOptRefresh, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-        fButOptNext = new TGTextButton(switchbuttonbar, "Next>>");  ///< Load Event button
+        fButOptNext = new TGTextButton(switchButtonBar, "Next>>");  ///< Load Event button
         fButOptNext->Connect("Clicked()", "TRestBrowser", this, "NextPlotOptionAction()");
-        switchbuttonbar->AddFrame(fButOptNext, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+        switchButtonBar->AddFrame(fButOptNext, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
     }
-    fVFrame->AddFrame(switchbuttonbar, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(switchButtonBar, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
     // tool buttons
-    fMenuOpen = new TGPictureButton(fVFrame, gClient->GetPicture(icondir + "bld_open.png"));
+    fMenuOpen = new TGPictureButton(vFrame, gClient->GetPicture(icondir + "bld_open.png"));
     fMenuOpen->Connect("Clicked()", "TRestBrowser", this, "LoadFileAction()");
-    fVFrame->AddFrame(fMenuOpen, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(fMenuOpen, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    fExit = new TGTextButton(fVFrame, "EXIT");  ///< Exit button
+    fExit = new TGTextButton(vFrame, "EXIT");  ///< Exit button
     fExit->Connect("Clicked()", "TRestBrowser", this, "ExitAction()");
-    fVFrame->AddFrame(fExit, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    vFrame->AddFrame(fExit, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
 
-    frmMain->Resize(TGDimension(300, frmMain->GetHeight() + fVFrame->GetHeight()));
+    frmMain->Resize(TGDimension(300, frmMain->GetHeight() + vFrame->GetHeight()));
 
-    frmMain->AddFrame(fVFrame, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
+    frmMain->AddFrame(vFrame, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY));
     // frmMain->DontCallClose();
     frmMain->MapSubwindows();
     // frmMain->Resize();
@@ -201,14 +201,14 @@ void TRestBrowser::SetButtons() {
 
 void TRestBrowser::InitFromConfigFile() { cout << __PRETTY_FUNCTION__ << endl; }
 
-void TRestBrowser::SetInputEvent(TRestEvent* eve) {
-    if (r != nullptr) {
-        r->SetInputEvent(eve);
+void TRestBrowser::SetInputEvent(TRestEvent* event) {
+    if (fRestRun != nullptr) {
+        fRestRun->SetInputEvent(event);
     }
 }
 
 Bool_t TRestBrowser::LoadEventEntry(Int_t n) {
-    if (r->GetInputFile() == nullptr || r->GetInputFile()->IsZombie()) {
+    if (fRestRun->GetInputFile() == nullptr || fRestRun->GetInputFile()->IsZombie()) {
         RESTWarning << "TRestBrowser::LoadEventEntry. No File..." << RESTendl;
         return kFALSE;
     }
@@ -217,21 +217,21 @@ Bool_t TRestBrowser::LoadEventEntry(Int_t n) {
         return kFALSE;
     }
 
-    if (r->GetAnalysisTree() != nullptr && n < r->GetAnalysisTree()->GetEntries() && n >= 0) {
-        r->GetEntry(n);
-        TRestEvent* ev = r->GetInputEvent();
+    if (fRestRun->GetAnalysisTree() != nullptr && n < fRestRun->GetAnalysisTree()->GetEntries() && n >= 0) {
+        fRestRun->GetEntry(n);
+        TRestEvent* ev = fRestRun->GetInputEvent();
         if (!ev) {
             RESTError << "internal error!" << RESTendl;
             return kFALSE;
         } else {
-            fEventRow = r->GetCurrentEntry();
+            fEventRow = fRestRun->GetCurrentEntry();
             fEventId = ev->GetID();
             fEventSubId = ev->GetSubID();
 
             fEventRowNumberBox->SetIntNumber(fEventRow);
             fEventIdNumberBox->SetIntNumber(fEventId);
             fEventSubIdNumberBox->SetIntNumber(fEventSubId);
-            r->GetAnalysisTree()->PrintObservables();
+            fRestRun->GetAnalysisTree()->PrintObservables();
         }
     } else {
         RESTWarning << "TRestBrowser::LoadEventEntry. Event out of limits" << RESTendl;
@@ -239,7 +239,7 @@ Bool_t TRestBrowser::LoadEventEntry(Int_t n) {
     }
 
     if (fEventViewer != nullptr) {
-        fEventViewer->AddEvent(r->GetInputEvent());
+        fEventViewer->AddEvent(fRestRun->GetInputEvent());
         fEventViewer->Plot(fPlotOptionTextBox->GetText());
         cout << endl;
     }
@@ -248,8 +248,8 @@ Bool_t TRestBrowser::LoadEventEntry(Int_t n) {
     return kTRUE;
 }
 
-Bool_t TRestBrowser::LoadEventId(Int_t id, Int_t subid) {
-    if (r->GetInputFile() == nullptr || r->GetInputFile()->IsZombie()) {
+Bool_t TRestBrowser::LoadEventId(Int_t eventID, Int_t subEventID) {
+    if (fRestRun->GetInputFile() == nullptr || fRestRun->GetInputFile()->IsZombie()) {
         RESTWarning << "TRestBrowser::LoadEventEntry. No File..." << RESTendl;
         return kFALSE;
     }
@@ -259,20 +259,21 @@ Bool_t TRestBrowser::LoadEventId(Int_t id, Int_t subid) {
         return kFALSE;
     }
 
-    if (r->GetAnalysisTree() != nullptr && r->GetAnalysisTree()->GetEntries() > 0) {
-        TRestEvent* ev = r->GetEventWithID(id, subid);
-        if (!ev) {
-            RESTWarning << "Event ID : " << id << " with sub ID : " << subid << " not found!" << RESTendl;
+    if (fRestRun->GetAnalysisTree() != nullptr && fRestRun->GetAnalysisTree()->GetEntries() > 0) {
+        TRestEvent* event = fRestRun->GetEventWithID(eventID, subEventID);
+        if (event != nullptr) {
+            RESTWarning << "Event ID : " << eventID << " with sub ID : " << subEventID << " not found!"
+                        << RESTendl;
             return kFALSE;
         } else {
-            fEventRow = r->GetCurrentEntry();
-            fEventId = ev->GetID();
-            fEventSubId = ev->GetSubID();
+            fEventRow = fRestRun->GetCurrentEntry();
+            fEventId = event->GetID();
+            fEventSubId = event->GetSubID();
 
             fEventRowNumberBox->SetIntNumber(fEventRow);
             fEventIdNumberBox->SetIntNumber(fEventId);
             fEventSubIdNumberBox->SetIntNumber(fEventSubId);
-            r->GetAnalysisTree()->PrintObservables();
+            fRestRun->GetAnalysisTree()->PrintObservables();
         }
     } else {
         RESTWarning << "TRestBrowser::LoadEventEntry. Event out of limits" << RESTendl;
@@ -280,7 +281,7 @@ Bool_t TRestBrowser::LoadEventId(Int_t id, Int_t subid) {
     }
 
     if (fEventViewer != nullptr) {
-        fEventViewer->AddEvent(r->GetInputEvent());
+        fEventViewer->AddEvent(fRestRun->GetInputEvent());
         fEventViewer->Plot(fPlotOptionTextBox->GetText());
         cout << endl;
     }
@@ -289,13 +290,13 @@ Bool_t TRestBrowser::LoadEventId(Int_t id, Int_t subid) {
     return kTRUE;
 }
 
-Bool_t TRestBrowser::OpenFile(TString filename) {
+Bool_t TRestBrowser::OpenFile(const TString& filename) {
     if (filename.Contains("http") || TRestTools::fileExists(filename.Data())) {
         fInputFileName = filename;
 
-        r->OpenInputFile(fInputFileName);
-        TFile* f = r->GetInputFile();
-        TTree* t = r->GetEventTree();
+        fRestRun->OpenInputFile(fInputFileName);
+        TFile* f = fRestRun->GetInputFile();
+        TTree* t = fRestRun->GetEventTree();
 
         TGeoManager* geometry = gGeoManager;
 
@@ -303,13 +304,13 @@ Bool_t TRestBrowser::OpenFile(TString filename) {
             // add entry for other event types
             TObjArray* branches = t->GetListOfBranches();
             for (int i = 0; i <= branches->GetLast(); i++) {
-                TBranch* br = (TBranch*)branches->At(i);
-                if (((string)br->GetName()).find("EventBranch") != -1) {
-                    string eventtype = Replace((string)br->GetName(), "Branch", "");
-                    fEventTypeComboBox->AddEntry(eventtype.c_str(), fEventTypeComboBox->GetNumberOfEntries());
+                auto branch = (TBranch*)branches->At(i);
+                if (((string)branch->GetName()).find("EventBranch") != -1) {
+                    string eventType = Replace((string)branch->GetName(), "Branch", "");
+                    fEventTypeComboBox->AddEntry(eventType.c_str(), fEventTypeComboBox->GetNumberOfEntries());
                     // we make the entry of input event being selected
-                    if (r->GetInputEvent() != nullptr &&
-                        (string)r->GetInputEvent()->ClassName() == eventtype) {
+                    if (fRestRun->GetInputEvent() != nullptr &&
+                        (string)fRestRun->GetInputEvent()->ClassName() == eventType) {
                         fEventTypeComboBox->Select(fEventTypeComboBox->GetNumberOfEntries() - 1, false);
                     }
                 }
@@ -324,11 +325,11 @@ Bool_t TRestBrowser::OpenFile(TString filename) {
             pureAnalysis = kTRUE;
         }
 
-        TRestEvent* ev = r->GetInputEvent();
+        TRestEvent* ev = fRestRun->GetInputEvent();
         if (!ev) {
             RESTError << "internal error!" << RESTendl;
         } else {
-            fEventRowNumberBox->SetIntNumber(r->GetCurrentEntry());
+            fEventRowNumberBox->SetIntNumber(fRestRun->GetCurrentEntry());
             fEventIdNumberBox->SetIntNumber(ev->GetID());
             fEventSubIdNumberBox->SetIntNumber(ev->GetSubID());
         }
@@ -370,7 +371,7 @@ void TRestBrowser::PlotAction() {
 }
 
 void TRestBrowser::RowValueChangedAction(Long_t val) {
-    int rowold = fEventRow;
+    int eventRow = fEventRow;
     fEventRow = (Int_t)fEventRowNumberBox->GetNumber();
 
     RESTDebug << "TRestBrowser::LoadEventAction. Entry:" << fEventRow << RESTendl;
@@ -378,24 +379,24 @@ void TRestBrowser::RowValueChangedAction(Long_t val) {
     bool success = LoadEventEntry(fEventRow);
 
     if (!success) {
-        fEventRow = rowold;
+        fEventRow = eventRow;
         fEventRowNumberBox->SetIntNumber(fEventRow);
     }
 }
 
 void TRestBrowser::EventTypeChangedAction(Int_t id) {
-    string eventtype = fEventTypeComboBox->GetSelectedEntry()->GetTitle();
-    TRestEvent* eve = REST_Reflection::Assembly(eventtype);
+    string eventType = fEventTypeComboBox->GetSelectedEntry()->GetTitle();
+    TRestEvent* eve = REST_Reflection::Assembly(eventType);
 
     if (eve != nullptr) {
-        r->SetInputEvent(eve);
+        fRestRun->SetInputEvent(eve);
         RowValueChangedAction(0);
     }
 }
 
 void TRestBrowser::IdValueChangedAction(Long_t val) {
-    int idold = fEventId;
-    int subidold = fEventSubId;
+    int eventID = fEventId;
+    int subEventID = fEventSubId;
 
     fEventId = (Int_t)fEventIdNumberBox->GetNumber();
     fEventSubId = (Int_t)fEventSubIdNumberBox->GetNumber();
@@ -406,8 +407,8 @@ void TRestBrowser::IdValueChangedAction(Long_t val) {
     bool success = LoadEventId(fEventId, fEventSubId);
 
     if (!success) {
-        fEventId = idold;
-        fEventSubId = subidold;
+        fEventId = eventID;
+        fEventSubId = subEventID;
         fEventIdNumberBox->SetIntNumber(fEventId);
         fEventSubIdNumberBox->SetIntNumber(fEventSubId);
     }
diff --git a/source/framework/core/src/TRestRun.cxx b/source/framework/core/src/TRestRun.cxx
index ec1df1ed2..2a1bc0b91 100644
--- a/source/framework/core/src/TRestRun.cxx
+++ b/source/framework/core/src/TRestRun.cxx
@@ -1227,25 +1227,17 @@ void TRestRun::SetExtProcess(TRestEventProcess* p) {
 void TRestRun::SetInputEvent(TRestEvent* event) {
     if (event != nullptr) {
         if (fEventTree != nullptr) {
-            // if (fEventBranchLoc != -1) {
-            //	TBranch *br = (TBranch*)branches->At(fEventBranchLoc);
-            //	br->SetAddress(0);
-            //}
             if (fInputEvent != nullptr) {
-                fEventTree->SetBranchAddress((TString)fInputEvent->ClassName() + "Branch", 0);
+                fEventTree->SetBranchAddress((TString)fInputEvent->ClassName() + "Branch", nullptr);
                 fEventTree->SetBranchStatus((TString)fInputEvent->ClassName() + "Branch", false);
             }
             TObjArray* branches = fEventTree->GetListOfBranches();
             string branchName = (string)event->ClassName() + "Branch";
             for (int i = 0; i <= branches->GetLast(); i++) {
-                TBranch* br = (TBranch*)branches->At(i);
-                if ((string)br->GetName() == branchName) {
+                auto branch = (TBranch*)branches->At(i);
+                if ((string)branch->GetName() == branchName) {
                     RESTDebug << "Setting input event.. Type: " << event->ClassName() << " Address: " << event
                               << RESTendl;
-                    // if (fInputEvent != nullptr && (char*)fInputEvent != (char*)eve) {
-                    //    delete fInputEvent;
-                    //}
-
                     fInputEvent = event;
                     fEventTree->SetBranchAddress(branchName.c_str(), &fInputEvent);
                     fEventTree->SetBranchStatus(branchName.c_str(), false);
@@ -1268,13 +1260,13 @@ void TRestRun::SetInputEvent(TRestEvent* event) {
 ///////////////////////////////////////////////
 /// \brief Add an event branch in output EventTree
 ///
-void TRestRun::AddEventBranch(TRestEvent* eve) {
-    if (eve != nullptr) {
+void TRestRun::AddEventBranch(TRestEvent* event) {
+    if (event != nullptr) {
         if (fEventTree != nullptr) {
-            string evename = (string)eve->ClassName();
-            string branchName = evename + "Branch";
-            fEventTree->Branch(branchName.c_str(), eve);
-            fEventTree->SetTitle((evename + "Tree").c_str());
+            string eventName = (string)event->ClassName();
+            string branchName = eventName + "Branch";
+            fEventTree->Branch(branchName.c_str(), event);
+            fEventTree->SetTitle((eventName + "Tree").c_str());
         }
     }
 }
@@ -1297,7 +1289,7 @@ void TRestRun::ImportMetadata(const TString& File, const TString& name, const TS
         return;
     }
 
-    TFile* f = new TFile(thisFile);
+    TFile* file = TFile::Open(thisFile);
     // TODO give error in case we try to obtain a class that is not TRestMetadata
     if (type == "" && name == "") {
         RESTError << "(ImportMetadata) : metadata type and name is not "
@@ -1308,17 +1300,17 @@ void TRestRun::ImportMetadata(const TString& File, const TString& name, const TS
 
     TRestMetadata* meta = nullptr;
     if (name != "") {
-        meta = GetMetadata(name, f);
+        meta = GetMetadata(name, file);
     } else if (type != "") {
-        meta = GetMetadataClass(type, f);
+        meta = GetMetadataClass(type, file);
     }
 
     if (meta == nullptr) {
         cout << "REST ERROR (ImportMetadata) : " << name << " does not exist." << endl;
         cout << "Inside root file : " << File << endl;
         GetChar();
-        f->Close();
-        delete f;
+        file->Close();
+        delete file;
         return;
     }
 
@@ -1329,8 +1321,8 @@ void TRestRun::ImportMetadata(const TString& File, const TString& name, const TS
 
     fMetadata.push_back(meta);
     meta->LoadConfigFromBuffer();
-    f->Close();
-    delete f;
+    file->Close();
+    delete file;
 }
 
 Int_t TRestRun::Write(const char* name, Int_t option, Int_t bufsize) {
@@ -1362,7 +1354,7 @@ int TRestRun::GetEntries() const {
 // Getters
 TRestEvent* TRestRun::GetEventWithID(Int_t eventID, Int_t subEventID, const TString& tag) {
     if (fAnalysisTree != nullptr) {
-        int nentries = fAnalysisTree->GetEntries();
+        int nEntries = fAnalysisTree->GetEntries();
 
         // set analysis tree to read only three branches
         fAnalysisTree->SetBranchStatus("*", false);
@@ -1372,7 +1364,7 @@ TRestEvent* TRestRun::GetEventWithID(Int_t eventID, Int_t subEventID, const TStr
 
         // just look through the whole analysis tree and find the entry
         // this is not good!
-        for (int i = 0; i < nentries; i++) {
+        for (int i = 0; i < nEntries; i++) {
             fAnalysisTree->GetEntry(i);
             if (fAnalysisTree->GetEventID() == eventID) {
                 if (subEventID != -1 && fAnalysisTree->GetSubEventID() != subEventID) continue;
@@ -1397,7 +1389,7 @@ std::vector<int> TRestRun::GetEventEntriesWithConditions(const string& cuts, int
     std::vector<string> observables;
     std::vector<string> operators;
     std::vector<Double_t> values;
-    // it is necessary that this vector vector is sorted from longest to shortest
+    // it is necessary that this vector is sorted from longest to shortest
     const std::vector<string> validOperators = {"==", "<=", ">=", "=", ">", "<"};
 
     vector<string> cutsVector = Split(cuts, "&&", false, true);
@@ -1546,19 +1538,19 @@ string TRestRun::GetRunInformation(const string& info) {
     return info;
 }
 
-TRestMetadata* TRestRun::GetMetadataClass(const TString& type, TFile* f) {
-    if (f != nullptr) {
-        TIter nextkey(f->GetListOfKeys());
+TRestMetadata* TRestRun::GetMetadataClass(const TString& type, TFile* file) {
+    if (file != nullptr) {
+        TIter nextkey(file->GetListOfKeys());
         TKey* key;
         while ((key = (TKey*)nextkey())) {
             string kName = key->GetClassName();
 
             if (REST_Reflection::GetClassQuick(kName.c_str()) != nullptr &&
                 REST_Reflection::GetClassQuick(kName.c_str())->InheritsFrom(type)) {
-                TRestMetadata* a = (TRestMetadata*)f->Get(key->GetName());
+                TRestMetadata* metadata = file->Get<TRestMetadata>(key->GetName());
 
-                if (a != nullptr && a->InheritsFrom("TRestMetadata")) {
-                    return a;
+                if (metadata != nullptr && metadata->InheritsFrom("TRestMetadata")) {
+                    return metadata;
                 } else {
                     RESTWarning << "TRestRun::GetMetadataClass() : The object to import is "
                                    "not inherited from TRestMetadata"
@@ -1578,18 +1570,18 @@ TRestMetadata* TRestRun::GetMetadataClass(const TString& type, TFile* f) {
     return nullptr;
 }
 
-TRestMetadata* TRestRun::GetMetadata(const TString& name, TFile* f) {
-    if (f != nullptr) {
-        TIter nextkey(f->GetListOfKeys());
+TRestMetadata* TRestRun::GetMetadata(const TString& name, TFile* file) {
+    if (file != nullptr) {
+        TIter nextkey(file->GetListOfKeys());
         TKey* key;
         while ((key = (TKey*)nextkey())) {
             string kName = key->GetName();
 
             if (kName == name) {
-                TRestMetadata* a = (TRestMetadata*)f->Get(name);
+                TRestMetadata* metadata = file->Get<TRestMetadata>(name);
 
-                if (a->InheritsFrom("TRestMetadata")) {
-                    return a;
+                if (metadata->InheritsFrom("TRestMetadata")) {
+                    return metadata;
                 } else {
                     RESTWarning << "TRestRun::GetMetadata() : The object to import is not "
                                    "inherited from TRestMetadata"
@@ -1600,10 +1592,6 @@ TRestMetadata* TRestRun::GetMetadata(const TString& name, TFile* f) {
     } else {
         for (unsigned int i = 0; i < fMetadata.size(); i++)
             if (fMetadata[i]->GetName() == name) return fMetadata[i];
-
-        // if (fInputFile != nullptr && this->GetVersionCode() >=
-        // ConvertVersionCode("2.2.1")) { 	return GetMetadata(name, fInputFile);
-        //}
     }
 
     return nullptr;
diff --git a/source/framework/core/src/TRestThread.cxx b/source/framework/core/src/TRestThread.cxx
index c98eba6d0..22799be15 100644
--- a/source/framework/core/src/TRestThread.cxx
+++ b/source/framework/core/src/TRestThread.cxx
@@ -404,18 +404,14 @@ void TRestThread::PrepareToProcess(bool* outputConfig) {
         fEventTree = new TTree((TString) "EventTree_" + ToString(fThreadId), "dummyTree");
         // fEventTree->CreateEventBranches();
 
-        if (outputConfig[2] == true) {
+        if (outputConfig[2]) {
             TString BranchName = (TString)fInputEvent->GetName() + "Branch";
             if (fEventTree->GetBranch(BranchName) == nullptr)  // avoid duplicated branch
+            {
                 fEventTree->Branch(BranchName, fInputEvent->ClassName(), fInputEvent);
+            }
         }
-        // currently external process analysis is not supported!
-
-        // if (fEventTree->GetListOfBranches()->GetLast() < 1)
-        //{
-        //	delete fEventTree; fEventTree = nullptr;
-        //}
-        // fAnalysisTree->CreateBranches();
+        // currently, external process analysis is not supported!
     }
     if (outputConfigToDel) delete outputConfig;
 }
@@ -432,7 +428,7 @@ void TRestThread::PrepareToProcess(bool* outputConfig) {
 /// Note: The methods GetNextevtFunc() and FillThreadEventFunc() are all from
 /// TRestProcessRunner. The later two will call back the method FillEvent(),
 /// EndProcess() in this class. The idea to do so is to make a unified
-/// managemenet of these i-o related methods. In TRestRun the three methods are
+/// management of these i-o related methods. In TRestRun the three methods are
 /// mutex locked. They will be paused until the host run allows it to run. This
 /// prevents segmentation violation due to simultaneously read/write.
 void TRestThread::StartProcess() {
diff --git a/source/framework/tools/inc/TRestStringOutput.h b/source/framework/tools/inc/TRestStringOutput.h
index 1671599a7..e37032cc4 100644
--- a/source/framework/tools/inc/TRestStringOutput.h
+++ b/source/framework/tools/inc/TRestStringOutput.h
@@ -144,18 +144,17 @@ struct endl_t {
 /// To use this tool class in the other classes, include this header file.
 /// You will get several global output objects: fout, info, essential, debug, etc.
 /// they works similarly as std::cout: `fout<<"hello world"<<endl;`. It is also possible
-/// to initialize a local TRestStringOutput object. Then one can costomize output color,
+/// to initialize a local TRestStringOutput object. Then one can customize output color,
 /// border and orientation on that.
 class TRestStringOutput {
    public:
     //////////////////////////////////////////////////////////////////////////
     /// Enumerate of verbose level, containing five levels
     enum class REST_Verbose_Level {
-        REST_Silent = 0,     //!< show minimum information of the software, as well as error
-                             //!< messages
+        REST_Silent = 0,     //!< show minimum information of the software, as well as error messages
         REST_Essential = 1,  //!< +show some essential information, as well as warnings
         REST_Warning = REST_Essential,
-        REST_Info = 2,    //!< +show most of the infomation for each steps
+        REST_Info = 2,    //!< +show most of the information for each steps
         REST_Debug = 3,   //!< +show the defined debug messages
         REST_Extreme = 4  //!< show everything
     };
@@ -176,9 +175,6 @@ class TRestStringOutput {
 
     REST_Verbose_Level verbose;
 
-    void lock();
-    void unlock();
-
    public:
     REST_Verbose_Level GetVerboseLevel() { return verbose; }
     std::string GetBuffer() { return buf.str(); }
diff --git a/source/framework/tools/inc/TRestTools.h b/source/framework/tools/inc/TRestTools.h
index 22a01e540..d85e357bb 100644
--- a/source/framework/tools/inc/TRestTools.h
+++ b/source/framework/tools/inc/TRestTools.h
@@ -108,7 +108,7 @@ class TRestTools {
     static std::pair<std::string, std::string> SeparatePathAndName(const std::string& fullname);
     static std::string GetPureFileName(const std::string& fullPathFileName);
     static std::string SearchFileInPath(std::vector<std::string> path, std::string filename);
-    static Int_t CheckTheFile(std::string configFilename);
+    static bool CheckFileIsAccessible(const std::string&);
     static std::vector<std::string> GetFilesMatchingPattern(std::string pattern);
     static int ConvertVersionCode(std::string in);
     static std::istream& GetLine(std::istream& is, std::string& t);
diff --git a/source/framework/tools/src/TRestTools.cxx b/source/framework/tools/src/TRestTools.cxx
index 3097ac72e..97fc85cc9 100644
--- a/source/framework/tools/src/TRestTools.cxx
+++ b/source/framework/tools/src/TRestTools.cxx
@@ -770,19 +770,19 @@ string TRestTools::SearchFileInPath(vector<string> paths, string filename) {
 }
 
 ///////////////////////////////////////////////
-/// \brief Checks if the config file can be openned. It returns OK in case of
-/// success, ERROR otherwise.
+/// \brief Checks if the config file can be opened (and thus exists).
+/// It returns true in case of success, false otherwise.
 ///
-Int_t TRestTools::CheckTheFile(std::string configFilename) {
+bool TRestTools::CheckFileIsAccessible(const std::string& filename) {
     ifstream ifs;
-    ifs.open(configFilename.c_str());
+    ifs.open(filename.c_str());
 
     if (!ifs) {
-        return -1;
-    } else
+        return false;
+    } else {
         ifs.close();
-
-    return 0;
+    }
+    return true;
 }
 
 ///////////////////////////////////////////////