diff --git a/Analysis/ReadDigi/src/ReadDigiAlg.cpp b/Analysis/ReadDigi/src/ReadDigiAlg.cpp
index c2cdb4ed1ac425654bc488abbfdb1714a83c6081..5d4f56b6cf22c0ad9244f3c5b426045657206036 100644
--- a/Analysis/ReadDigi/src/ReadDigiAlg.cpp
+++ b/Analysis/ReadDigi/src/ReadDigiAlg.cpp
@@ -52,6 +52,9 @@ StatusCode ReadDigiAlg::initialize()
   m_mctree->Branch("MCP_py", &MCP_py);
   m_mctree->Branch("MCP_pz", &MCP_pz);
   m_mctree->Branch("MCP_E", &MCP_E);
+  m_mctree->Branch("MCP_VTX_x", &MCP_VTX_x);
+  m_mctree->Branch("MCP_VTX_y", &MCP_VTX_y);
+  m_mctree->Branch("MCP_VTX_z", &MCP_VTX_z);
   m_mctree->Branch("MCP_endPoint_x", &MCP_endPoint_x);
   m_mctree->Branch("MCP_endPoint_y", &MCP_endPoint_y);
   m_mctree->Branch("MCP_endPoint_z", &MCP_endPoint_z);
@@ -176,6 +179,9 @@ StatusCode ReadDigiAlg::execute()
       MCP_py.push_back(m_MCp.getMomentum().y);
       MCP_pz.push_back(m_MCp.getMomentum().z);
       MCP_E.push_back(m_MCp.getEnergy());
+      MCP_VTX_x.push_back(m_MCp.getVertex().x);
+      MCP_VTX_y.push_back(m_MCp.getVertex().y);
+      MCP_VTX_z.push_back(m_MCp.getVertex().z);
       MCP_endPoint_x.push_back(m_MCp.getEndpoint().x); 
       MCP_endPoint_y.push_back(m_MCp.getEndpoint().y); 
       MCP_endPoint_z.push_back(m_MCp.getEndpoint().z); 
@@ -359,8 +365,9 @@ StatusCode ReadDigiAlg::execute()
     N_fullTrk = const_fullTrkCol->size();
     for(int i=0; i<N_fullTrk; i++){
       auto m_trk = const_fullTrkCol->at(i);
+//cout<<"In track #"<<i<<": track state size "<<m_trk.trackStates_size()<<", track hit size "<<m_trk.trackerHits_size()<<endl;
       if(m_trk.trackStates_size()==0) continue;
-      if(m_trk.trackerHits_size()==0) continue;
+      //if(m_trk.trackerHits_size()==0) continue;
       int NTrkHit = m_trk.trackerHits_size();
 
       for(int istat=0; istat<m_trk.trackStates_size(); istat++){
@@ -520,6 +527,9 @@ StatusCode ReadDigiAlg::Clear()
   MCP_py.clear();
   MCP_pz.clear();
   MCP_E.clear();
+  MCP_VTX_x.clear();
+  MCP_VTX_y.clear();
+  MCP_VTX_z.clear();
   MCP_endPoint_x.clear();
   MCP_endPoint_y.clear();
   MCP_endPoint_z.clear();
diff --git a/Analysis/ReadDigi/src/ReadDigiAlg.h b/Analysis/ReadDigi/src/ReadDigiAlg.h
index ea79a581400cd1c5b77d5f2af2b2d0607b9d0f50..1eef085ced179298cae702398d4ee5f20d1e513f 100644
--- a/Analysis/ReadDigi/src/ReadDigiAlg.h
+++ b/Analysis/ReadDigi/src/ReadDigiAlg.h
@@ -70,7 +70,7 @@ private :
 
   //MCParticle
   int N_MCP;
-  FloatVec MCP_px, MCP_py, MCP_pz, MCP_E, MCP_endPoint_x, MCP_endPoint_y, MCP_endPoint_z;
+  FloatVec MCP_px, MCP_py, MCP_pz, MCP_E, MCP_VTX_x, MCP_VTX_y, MCP_VTX_z, MCP_endPoint_x, MCP_endPoint_y, MCP_endPoint_z;
   IntVec MCP_pdgid, MCP_gStatus; 
 
   //Tracker 
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py b/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
index daacc15445fc63715cbde5fe9f124ce62b4e8cbe..ab968e5236594c4cd130beb16046fc1b48f6b9e8 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
@@ -257,8 +257,8 @@ full.SITHitToTrackDistance = 3.
 full.SETHitToTrackDistance = 5.
 full.MinChi2ProbForSiliconTracks = 0
 full.MaxChi2PerHit = 200
-#full.ForceSiTPCMerging = True
-#full.ForceTPCSegmentsMerging = True
+full.ForceSiTPCMerging = True
+full.ForceTPCSegmentsMerging = True
 #full.OutputLevel = DEBUG
 
 from Configurables import TPCDndxAlg
diff --git a/Reconstruction/RecPFACyber/script/tracking.py b/Reconstruction/RecPFACyber/script/tracking.py
index be11bff450ff3e23540751d378e62c2f574de2dc..76c38cb87933e5a3062a7ff65593585214431583 100644
--- a/Reconstruction/RecPFACyber/script/tracking.py
+++ b/Reconstruction/RecPFACyber/script/tracking.py
@@ -67,8 +67,8 @@ ftdhitname  = "FTDTrackerHits"
 ftdspname   = "FTDSpacePoints"
 from Configurables import SmearDigiTool
 vxdtool = SmearDigiTool("VXD")
-vxdtool.ResolutionU = [0.004, 0.004, 0.004, 0.004, 0.004, 0.004]
-vxdtool.ResolutionV = [0.004, 0.004, 0.004, 0.004, 0.004, 0.004]
+vxdtool.ResolutionU = [0.005]
+vxdtool.ResolutionV = [0.005]
 vxdtool.UsePlanarTag = True
 vxdtool.ParameterizeResolution = False
 vxdtool.ParametersU = [5.60959e-03, 5.74913e-03, 7.03433e-03, 1.99516, -663.952, 3.752e-03, 0, -0.0704734, 0.0454867e-03, 1.07359]
@@ -102,8 +102,8 @@ digiSET.IsStrip = False
 digiSET.SimTrackHitCollection = "OTKBarrelCollection"
 digiSET.TrackerHitCollection = sethitname
 digiSET.TrackerHitAssociationCollection = "OTKBarrelTrackerHitAssociation"
-digiSET.ResolutionU = [0.005]
-digiSET.ResolutionV = [0.021]
+digiSET.ResolutionU = [0.010]
+digiSET.ResolutionV = [1.000]
 digiSET.UsePlanarTag = True
 digiSET.ParameterizeResolution = False
 digiSET.ParametersU = [2.29655e-03, 0.965899e-03, 0.584699e-03, 17.0856, 84.566, 12.4695e-03, -0.0643059, 0.168662, 1.87998e-03, 0.514452]