diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 4f8fdc24b..e1f143143 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -182,14 +182,6 @@ jobs:
       #    source $(root-config --bindir)/thisroot.sh
       #    cd framework/pipeline/metadata/gas/
       #    restRoot -b -q GenerateDummyGas.C
-      - name: Generate Readout
-        run: |
-          source ${{ env.REST_PATH }}/thisREST.sh
-          cd framework/pipeline/metadata/readout/
-          restManager --c generateReadout.rml --o readout.root
-          restRoot -b -q PrintReadout.C'("readout.root")' > /dev/null
-      # We need to introduce basic validation here
-      #    - diff validation.txt print.txt
       - name: Basic Readout
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
diff --git a/examples/01.alphaTrack/readout/GenerateReadouts.C b/examples/01.alphaTrack/readout/GenerateReadouts.C
new file mode 100644
index 000000000..be2d9f49a
--- /dev/null
+++ b/examples/01.alphaTrack/readout/GenerateReadouts.C
@@ -0,0 +1,11 @@
+Int_t GenerateReadouts() {
+    TRestDetectorReadout* readout = new TRestDetectorReadout("readouts.rml", "readout");
+    TRestDetectorReadout* cathode = new TRestDetectorReadout("readouts.rml", "cathode");
+
+    TFile* f = new TFile("readouts.root", "RECREATE");
+    readout->Write("readout");
+    cathode->Write("cathode");
+    f->Close();
+
+    return 0;
+}
diff --git a/examples/01.alphaTrack/readout/readouts.rml b/examples/01.alphaTrack/readout/readouts.rml
index 6af7afe56..f3b495c12 100644
--- a/examples/01.alphaTrack/readout/readouts.rml
+++ b/examples/01.alphaTrack/readout/readouts.rml
@@ -1,45 +1,37 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <readouts>
     <globals>
         <!-- The pitch value in mm -->
-        <variable name="PITCH" value="1" overwrite="false" />
+        <variable name="PITCH" value="1" overwrite="false"/>
         <!-- The number of modules per axis MxM -->
-        <variable name="N_MODULES" value="1" overwrite="false" />
+        <variable name="N_MODULES" value="1" overwrite="false"/>
         <!-- The number of pixels per side PxP -->
-        <variable name="N_CHANNELS" value="120" overwrite="false" />
+        <variable name="N_CHANNELS" value="120" overwrite="false"/>
     </globals>
-
     <TRestDetectorReadout name="cathode" title="Cathode ${PITCH} mm-Pitch ${N_CHANNELS}+${N_CHANNELS} channels">
-
-        <constant name="pitch" value="${PITCH}" overwrite="false" />
+        <constant name="pitch" value="${PITCH}" overwrite="false"/>
         <!-- The number of modules per axis MxM -->
-        <constant name="nModules" value="${N_MODULES}" overwrite="false" />
-
+        <constant name="nModules" value="${N_MODULES}" overwrite="false"/>
         <!-- The number of pixels per side PxP -->
-        <constant name="nChannels" value="${N_CHANNELS}" overwrite="false" />
-        <constant name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-        <parameter name="mappingNodes" value="400" />
-        <include file="microbulkModule.rml" />
-        <readoutPlane position="(0,0,0)mm" planeVector="(0,0,1)" chargeCollection="1" cathodePosition="(0,0,50)mm">
-            <addReadoutModule id="0" name="module" origin="(-0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0" decodingFile="" firstDaqChannel="0" />
+        <constant name="nChannels" value="${N_CHANNELS}" overwrite="false"/>
+        <constant name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+        <parameter name="mappingNodes" value="400"/>
+        <include file="microbulkModule.rml"/>
+        <readoutPlane position="(0,0,0)mm" normal="(0,0,1)" chargeCollection="1" height="50mm">
+            <addReadoutModule id="0" name="module" origin="(-0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0" decodingFile="" firstDaqChannel="0"/>
         </readoutPlane>
     </TRestDetectorReadout>
-
     <TRestDetectorReadout name="readout" title="Readout ${PITCH} mm-Pitch ${N_CHANNELS}+${N_CHANNELS} channels">
-
-        <constant name="pitch" value="${PITCH}" overwrite="false" />
+        <constant name="pitch" value="${PITCH}" overwrite="false"/>
         <!-- The number of modules per axis MxM -->
-        <constant name="nModules" value="${N_MODULES}" overwrite="false" />
-
+        <constant name="nModules" value="${N_MODULES}" overwrite="false"/>
         <!-- The number of pixels per side PxP -->
-        <constant name="nChannels" value="${N_CHANNELS}" overwrite="false" />
-        <constant name="pixelSize" value="${PITCH}/sqrt(2.)" />
-
-        <parameter name="mappingNodes" value="400" />
-        <include file="microbulkModule.rml" />
-        <readoutPlane position="(0,0,50)mm" planeVector="(0,0,-1)" chargeCollection="1" cathodePosition="(0,0,0)mm">
-            <addReadoutModule id="0" name="module" origin="(-0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0" decodingFile="" firstDaqChannel="0" />
+        <constant name="nChannels" value="${N_CHANNELS}" overwrite="false"/>
+        <constant name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+        <parameter name="mappingNodes" value="400"/>
+        <include file="microbulkModule.rml"/>
+        <readoutPlane position="(0,0,50)mm" normal="(0,0,-1)" chargeCollection="1" height="50mm">
+            <addReadoutModule id="0" name="module" origin="(-0.5*nChannels*pitch,-0.5*nChannels*pitch)" rotation="0" decodingFile="" firstDaqChannel="0"/>
         </readoutPlane>
     </TRestDetectorReadout>
 </readouts>
diff --git a/examples/01.alphaTrack/readout/readouts.root b/examples/01.alphaTrack/readout/readouts.root
index f8294571b..bebc65a10 100644
Binary files a/examples/01.alphaTrack/readout/readouts.root and b/examples/01.alphaTrack/readout/readouts.root differ
diff --git a/examples/readouts.rml b/examples/readouts.rml
index cfa3416a0..de55d44b5 100644
--- a/examples/readouts.rml
+++ b/examples/readouts.rml
@@ -1,330 +1,84 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
-<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>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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" >
+  <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>
+    <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>
 
     // 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>
+    <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>
+    <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 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"  />
-        </for>
-      </for>
-    </readoutPlane>
+  <TRestReadout name="PixelReadout_MxM" title="PIXEL readout ${PITCH}mm-Pitch ${MODULES}x${MODULES} modules ${CHANNELS}+${CHANNELS} channels"><constant name="nChannels" value="${CHANNELS}"/><constant name="nModules" value="${MODULES}"/><constant name="pitch" value="${PITCH}"/><constant 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" normal="(0,0,1)" chargeCollection="1" height="990mm"><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" normal="(0,0,-1)" chargeCollection="1" height="990mm"><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>
+  <TRestReadout name="PandaReadout_MxM" title="PANDA readout ${PITCH}mm-Pitch ${MODULES}x${MODULES} modules ${CHANNELS}+${CHANNELS} channels"><constant name="nChannels" value="${CHANNELS}"/><constant name="nModules" value="${MODULES}"/><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,-990)mm" normal="(0,0,1)" chargeCollection="1" height="990mm"><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" normal="(0,0,-1)" chargeCollection="1" height="990mm"><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.)" />
+  <TRestReadout name="Panda_SJTU_Proto" title="PANDA SJTU Prototype readout. 7 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,-170)mm" normal="(0,0,1)" chargeCollection="1" height="170mm"><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>
 
-    <parameter name="mappingNodes" value="0" />
+  <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" normal="(0,0,-1*${plane})" chargeCollection="1" height="990mm"><addReadoutModule id="1" name="module" origin="( -1000 , -1000 )" rotation="0"/></readoutPlane></for></TRestReadout>
 
-    <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" >
+  <TRestReadout name="Panda-CDR" title="PANDA SJTU Jinping readout. 2 planes 41 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"/><for variable="plane" from="-1" to="2" step="2"><readoutPlane position="(0,0,955*${plane})mm" normal="(0,0,-1*${plane})" chargeCollection="1" height="955mm">
 
         // 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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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" >
+  <TRestReadout name="Panda-Jinping" title="PANDA SJTU Jinping readout. 2 planes 33 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"/><for variable="plane" from="-1" to="2" step="2"><readoutPlane position="(0,0,955*${plane})mm" normal="(0,0,-1*${plane})" chargeCollection="1" height="955mm">
 
         // 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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
-  </TRestReadout>
+        <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></TRestReadout>
 
 </readouts>
diff --git a/examples/saveMetadataFile.rml b/examples/saveMetadataFile.rml
index 3452234c5..d50d34f8a 100644
--- a/examples/saveMetadataFile.rml
+++ b/examples/saveMetadataFile.rml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--We generate two TRestDetectorGas objects and a TRestDetectorReadout object in this example, and save them to a root
 file known as metadata file. The file can be used in "addMetadata" section in TRestRun in future.
 
@@ -12,54 +11,44 @@ readout plane and add the modules piece by piece.
 
 Finally we call the method TRestRun::FormOutputFile() through TRestManager to save the metadata file.
 -->
-
 <TRestManager verboseLevel="silent">
-  <globals>
-    <searchPath value="${REST_INPUTDATA}/definitions/"/>
-    <searchPath value="${REST_INPUTDATA}/gasFiles/"/>
-    <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>
-
-  <TRestRun name="readoutrun">
-    <TRestDetectorGas name="Xenon 10-10E3Vcm" pressure="10" file="server"/>
-    <TRestDetectorGas name="Xenon-TMA 1Pct 10-10E3Vcm" pressure="10" file="server"/>
-
-    <TRestDetectorReadout name="Panda-CDR" title="PANDA CDR" file="readouts.rml" />
-
-    <TRestDetectorReadout name="PandaReadout_MxM" title="PANDA readout 7module" >
-      <parameter name="verboseLevel" value="info"/>
-      <parameter name="mappingNodes" value="0" />
-      <myParameter name="nChannels" value="${CHANNELS}" />
-      <myParameter name="nModules" value="${MODULES}" />
-      <myParameter name="pitch" value="${PITCH}" />
-      <myParameter name="pixelSize" value="${PITCH}/sqrt(2.)" />
-      <myParameter name="myDecodingFile" value="${REST_INPUTDATA}/decoding/MM_On_AGET0-1.dec"/>
-
-      <readoutModule name="module" file="microbulkModule.rml"/>
-
-      <readoutPlane position="(0,0,990)mm" planeVector="(0,0,-1)mm"
-          chargeCollection="1"
-          cathodePosition="(0,0,0)mm" >
+    <globals>
+        <searchPath value="${REST_INPUTDATA}/definitions/"/>
+        <searchPath value="${REST_INPUTDATA}/gasFiles/"/>
+        <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>
+    <TRestRun name="readoutrun">
+        <TRestDetectorGas name="Xenon 10-10E3Vcm" pressure="10" file="server"/>
+        <TRestDetectorGas name="Xenon-TMA 1Pct 10-10E3Vcm" pressure="10" file="server"/>
+        <TRestDetectorReadout name="Panda-CDR" title="PANDA CDR" file="readouts.rml"/>
+        <TRestDetectorReadout name="PandaReadout_MxM" title="PANDA readout 7module">
+            <parameter name="verboseLevel" value="info"/>
+            <parameter name="mappingNodes" value="0"/>
+            <constant name="nChannels" value="${CHANNELS}"/>
+            <constant name="nModules" value="${MODULES}"/>
+            <constant name="pitch" value="${PITCH}"/>
+            <constant name="pixelSize" value="${PITCH}/sqrt(2.)"/>
+            <constant name="myDecodingFile" value="${REST_INPUTDATA}/decoding/MM_On_AGET0-1.dec"/>
+            <readoutModule name="module" file="microbulkModule.rml"/>
+            <readoutPlane position="(0,0,990)mm" normal="(0,0,-1)mm" chargeCollection="1" height="990mm">
 
         see the readout plane configuration here : https://pandax.physics.sjtu.edu.cn/docdb3/0004/000496/005/Data_taking_prototype%20_1130.pdf
 
-        <addReadoutModule id="0" name="module" origin="(292.175,-194.65)" rotation="90" decodingFile="myDecodingFile" firstDaqChannel="136*5" />
-        <addReadoutModule id="2" name="module" origin="(-292.175,194.65)" rotation="-90" decodingFile="myDecodingFile" firstDaqChannel="136*3"/>
-        <addReadoutModule id="3" name="module" origin="(292.175,1.15)" rotation="90"  decodingFile="myDecodingFile" firstDaqChannel="136*4"/>
-        <addReadoutModule id="4" name="module" origin="(-292.175,-1.525)" rotation="-90"  decodingFile="myDecodingFile" firstDaqChannel="136*2"/>
-        <addReadoutModule id="6" name="module" origin="(-96.75,-96.375)" rotation="0"  decodingFile="myDecodingFile" firstDaqChannel="136*1"/>
-        <addReadoutModule id="8" name="module" origin="(96.75,292.175)" rotation="180" decodingFile="myDecodingFile" firstDaqChannel="136*6+68"/>
-        <addReadoutModule id="9" name="module" origin="(-96.75,-292.175)" rotation="0" decodingFile="myDecodingFile" firstDaqChannel="136*0"/>
-
-      </readoutPlane>
-    </TRestDetectorReadout>
-  </TRestRun>
-
-  <addTask command="readoutrun->FormOutputFile()" value="ON"/>
-
+                <addReadoutModule id="0" name="module" origin="(292.175,-194.65)" rotation="90" decodingFile="myDecodingFile" firstDaqChannel="136*5"/>
+                <addReadoutModule id="2" name="module" origin="(-292.175,194.65)" rotation="-90" decodingFile="myDecodingFile" firstDaqChannel="136*3"/>
+                <addReadoutModule id="3" name="module" origin="(292.175,1.15)" rotation="90" decodingFile="myDecodingFile" firstDaqChannel="136*4"/>
+                <addReadoutModule id="4" name="module" origin="(-292.175,-1.525)" rotation="-90" decodingFile="myDecodingFile" firstDaqChannel="136*2"/>
+                <addReadoutModule id="6" name="module" origin="(-96.75,-96.375)" rotation="0" decodingFile="myDecodingFile" firstDaqChannel="136*1"/>
+                <addReadoutModule id="8" name="module" origin="(96.75,292.175)" rotation="180" decodingFile="myDecodingFile" firstDaqChannel="136*6+68"/>
+                <addReadoutModule id="9" name="module" origin="(-96.75,-292.175)" rotation="0" decodingFile="myDecodingFile" firstDaqChannel="136*0"/>
+
+            </readoutPlane>
+        </TRestDetectorReadout>
+    </TRestRun>
+    <addTask command="readoutrun-&gt;FormOutputFile()" value="ON"/>
 </TRestManager>
diff --git a/pipeline/pandaxiii_MC/readout-140kg.rml b/pipeline/pandaxiii_MC/readout-140kg.rml
index e44415e5d..e4ff8fc72 100644
--- a/pipeline/pandaxiii_MC/readout-140kg.rml
+++ b/pipeline/pandaxiii_MC/readout-140kg.rml
@@ -1,137 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
-<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>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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">
+    <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>
+        <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>
 
         // 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>
+        <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 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>
 
     <!-- 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">
+    <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" normal="(0,0,-1)" chargeCollection="1" height="1201.5mm">
 
             // 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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
-
+            <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>
 
-    </TRestDetectorReadout>
+        </readoutPlane></TRestDetectorReadout>
 
 </readouts>
diff --git a/projects/basic-examples b/projects/basic-examples
index b4024cdee..66a87137a 160000
--- a/projects/basic-examples
+++ b/projects/basic-examples
@@ -1 +1 @@
-Subproject commit b4024cdee6e77c806ff3e83fa3c8b1dad1ec1100
+Subproject commit 66a87137abe46feaa6be8eecbc05b690d813a9a3