'CMakeLists.txt' (TrkDetDescrUnitTests-00-01-05)

        * Fix coverity issue 24994 (resource leak).

2014-12-05 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
        * coverity fix
        * tag as TrkDetDescrUnitTests-00-01-04

2014-11-04 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
        * update to new layersOrdered
        * tag as TrkDetDescrUnitTests-00-01-02 & 03

2014-09-09 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
        * updates to MIG5 version allowing partial TP testing
        * tag as TrkDetDescrUnitTests-00-01-01

2014-08-20 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
        * mig5 version (first)
        * tag as TrkDetDescrUnitTests-00-01-00

Tracking/TrkDetDescr/TrkDetDescrUnitTests/CMakeLists.txt

+################################################################################
+# Package: TrkDetDescrUnitTests
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrkDetDescrUnitTests )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaBaseComps
+                          GaudiKernel
+                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
+                          PRIVATE
+                          DetectorDescription/GeoPrimitives
+                          Tracking/TrkDetDescr/TrkDetDescrUtils
+                          Tracking/TrkDetDescr/TrkGeometry
+                          Tracking/TrkDetDescr/TrkSurfaces
+                          Tracking/TrkDetDescr/TrkVolumes
+                          Tracking/TrkEvent/TrkNeutralParameters
+                          Tracking/TrkUtilityPackages/TrkValidationUtils )
+
+# External dependencies:
+find_package( Eigen )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# tag use_new_tracking_edm was not recognized in automatic conversion in cmt2cmake
+
+# Component(s) in the package:
+atlas_add_component( TrkDetDescrUnitTests
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces GeoPrimitives TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkNeutralParameters TrkValidationUtils )
+
+# Install files from the package:
+atlas_install_headers( TrkDetDescrUnitTests )
+

Tracking/TrkDetDescr/TrkDetDescrUnitTests/TrkDetDescrUnitTests/SurfaceIntersectionTest.h

@@ -3,7 +3,7 @@
 */
 
 //////////////////////////////////////////////////////////////////
-// SurfaceIntersectionTest.h, (c) ATLAS Detector software
+// IntersectionTest.h, (c) ATLAS Detector software
 ///////////////////////////////////////////////////////////////////
 
 #ifndef TRKDETDESCRUNITTESTS_SURFACEINTERSECTIONTEST_H
@@ -19,7 +19,7 @@
 
 namespace Trk {
              
-    /** @class SurfaceIntersectionTest
+    /** @class IntersectionTest
        
         Test calling the internal surface intersection methods 
         

Tracking/TrkDetDescr/TrkDetDescrUnitTests/TrkDetDescrUnitTests/TrkDetDescrTPCnvTest.h

@@ -38,6 +38,7 @@ namespace Trk {
          
          std::string m_materialStepCollectionName;
          std::string m_layerMaterialCollectionName;
+         std::string m_elementTableName;
                                            
    };
 }

Tracking/TrkDetDescr/TrkDetDescrUnitTests/cmt/requirements

@@ -16,6 +16,7 @@ use TrkVolumes            TrkVolumes-*            Tracking/TrkDetDescr
 use TrkSurfaces           TrkSurfaces-*           Tracking/TrkDetDescr
 use TrkDetDescrUtils      TrkDetDescrUtils-*      Tracking/TrkDetDescr
 use TrkValidationUtils    TrkValidationUtils-*    Tracking/TrkUtilityPackages
+use TrkNeutralParameters  TrkNeutralParameters-*  Tracking/TrkEvent
 
 library TrkDetDescrUnitTests *.cxx components/*.cxx
 apply_pattern component_library

Tracking/TrkDetDescr/TrkDetDescrUnitTests/share/TrackingGeometryTest_jobOptions.py

@@ -10,7 +10,7 @@
 
 # Use McEventSelector so we can run with AthenaMP
 import AthenaCommon.AtlasUnixGeneratorJob
-include("BFieldAth/BFieldAth_jobOptions.py")
+
 #--------------------------------------------------------------
 # Private Application Configuration options
 #--------------------------------------------------------------
@@ -40,10 +40,18 @@ conddb.setGlobalTag("OFLCOND-MC12-SDR-06")
 
 # switch the material loading off
 from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
-TrkDetFlags.MaterialSource           = 'COOL'
+TrkDetFlags.MaterialSource           = 'None'
 TrkDetFlags.MaterialVersion          = 16
 TrkDetFlags.ConfigurationOutputLevel = VERBOSE
 
+
+TrkDetFlags.PixelBuildingOutputLevel     = VERBOSE
+TrkDetFlags.SCT_BuildingOutputLevel      = VERBOSE
+TrkDetFlags.TRT_BuildingOutputLevel      = VERBOSE
+TrkDetFlags.InDetBuildingOutputLevel     = VERBOSE
+TrkDetFlags.ConfigurationOutputLevel     = VERBOSE
+
+
 # load the tracking geometry service
 from TrkDetDescrSvc.AtlasTrackingGeometrySvc import AtlasTrackingGeometrySvc
 
@@ -108,6 +116,15 @@ TrackingGeometryTest = INFO
 # to be set explicitly, here, choose 10)
 theApp.EvtMax = 10
 
+from AthenaCommon.AppMgr import ServiceMgr
+# output level
+ServiceMgr.MessageSvc.OutputLevel  = INFO
+# increase the number of letter reserved to the alg/tool name from 18 to 30
+ServiceMgr.MessageSvc.Format       = "% F%50W%S%7W%R%T %0W%M"
+# to change the default limit on number of message
+ServiceMgr.MessageSvc.defaultLimit = 9999999  # all messages
+
+
 #==============================================================
 #
 # End of job options file

Tracking/TrkDetDescr/TrkDetDescrUnitTests/share/TrkDetDescrTPCnvTest_jobOptions.py

@@ -5,14 +5,20 @@
 #==============================================================
 
 #--------------------------------------------------------------
-# ATLAS default Application Configuration options
+# ATLAS default Application Cnviguration options
 #--------------------------------------------------------------
+WriteFile = False
 
 # Use McEventSelector so we can run with AthenaMP
-import AthenaCommon.AtlasUnixGeneratorJob
+if WriteFile :
+    import AthenaCommon.AtlasUnixGeneratorJob
+else :
+    import AthenaCommon.AtlasUnixStandardJob
+    import AthenaPoolCnvSvc.ReadAthenaPool 
+    ServiceMgr.EventSelector.InputCollections = [ 'TrkDetDescrTPCnvTest.root' ]
 
 #--------------------------------------------------------------
-# Private Application Configuration options
+# Private Application Cnviguration options
 #--------------------------------------------------------------
 
 # the global detflags
@@ -28,15 +34,18 @@ job = AlgSequence()
 # output collection name
 MaterialStepCollectionName       = 'RandomMaterialSteps'
 LayerMaterialCollectionName      = 'RandomLayerMaterial'
+ElementTableName                 = 'ElementTableName'
 
 # Add top algorithms to be run
 from TrkDetDescrUnitTests.TrkDetDescrUnitTestsConf import Trk__TrkDetDescrTPCnvTest
-TrkDetDescrTPConfTest = Trk__TrkDetDescrTPCnvTest('TrkDetDescrTPConfTest')
-TrkDetDescrTPConfTest.NumberOfTestsPerEvent         = 100
-TrkDetDescrTPConfTest.MaterialStepCollection   = MaterialStepCollectionName
-TrkDetDescrTPConfTest.LayerMaterialMap         = LayerMaterialCollectionName
-TrkDetDescrTPConfTest.OutputLevel              = VERBOSE
-job += TrkDetDescrTPConfTest   # 1 alg, named "BinUtilityTest"
+TrkDetDescrTPCnvTest = Trk__TrkDetDescrTPCnvTest('TrkDetDescrTPCnvTest')
+TrkDetDescrTPCnvTest.NumberOfTestsPerEvent         = 100
+TrkDetDescrTPCnvTest.MaterialStepCollection        = MaterialStepCollectionName
+TrkDetDescrTPCnvTest.LayerMaterialMap              = LayerMaterialCollectionName
+TrkDetDescrTPCnvTest.ElementTable                  = ElementTableName
+TrkDetDescrTPCnvTest.WriteMode                     = WriteFile
+TrkDetDescrTPCnvTest.OutputLevel                   = VERBOSE
+job += TrkDetDescrTPCnvTest   # 1 alg, named "     TrkDetDescrTPCnvTest"
 
 #--------------------------------------------------------------
 # Set output level threshold (DEBUG, INFO, WARNING, ERROR, FATAL)
@@ -63,7 +72,7 @@ BinUtilityTest = INFO
 # Number of events to be processed (default is until the end of
 # input, or -1, however, since we have no input, a limit needs
 # to be set explicitly, here, choose 10)
-theApp.EvtMax = 5
+theApp.EvtMax = 1
 
 #==============================================================
 #
@@ -73,14 +82,15 @@ theApp.EvtMax = 5
 
 
 ############### The Material hit collection ##################
-
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-# --- check dictionary
-ServiceMgr.AthenaSealSvc.CheckDictionary   = True
-# --- commit interval (test)
-ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG
-ServiceMgr.AthenaPoolCnvSvc.CommitInterval = 10
-MaterialStream              = AthenaPoolOutputStream ( 'TrkDetDescrTPCnv' )
-MaterialStream.OutputFile   =   "TrkDetDescrTPCnvTest.root" 
-MaterialStream.ItemList    += [ 'Trk::MaterialStepCollection#'+MaterialStepCollectionName ]
-MaterialStream.ItemList    += [ 'Trk::LayerMaterialMap#'+LayerMaterialCollectionName ]
+if WriteFile :
+    from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
+    # --- check dictionary
+    ServiceMgr.AthenaSealSvc.CheckDictionary   = True
+    # --- commit interval (test)
+    ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG
+    ServiceMgr.AthenaPoolCnvSvc.CommitInterval = 1
+    MaterialStream              = AthenaPoolOutputStream ( 'TrkDetDescrTPCnv' )
+    MaterialStream.OutputFile   =   'TrkDetDescrTPCnvTest.root' 
+    MaterialStream.ItemList    += [ 'Trk::MaterialStepCollection#'+MaterialStepCollectionName ]
+    MaterialStream.ItemList    += [ 'Trk::LayerMaterialMap#'+LayerMaterialCollectionName ]
+    MaterialStream.ItemList    += [ 'Trk::ElementTable#'+ElementTableName ]

Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/MappingTest.cxx

@@ -14,6 +14,7 @@
 #include "TrkGeometry/TrackingVolume.h"
 #include "TrkGeometry/Layer.h"
 #include "TrkVolumes/CylinderVolumeBounds.h"
+#include "TrkNeutralParameters/NeutralParameters.h"
 //Root includes
 #include "TTree.h"
 #include "TString.h"
@@ -154,22 +155,25 @@ StatusCode Trk::MappingTest::runTest()
                     // the mapping position & unit is the same
                     Amg::Vector3D position(mapX, mapY, mapZ);
                     Amg::Vector3D direction = position.normalized();
+                    // create curvilinear parameters
+                    Trk::NeutralCurvilinearParameters ncp(position,direction,0.);
                     // get the closest material layer
-                    const Trk::LayerIntersection lIntersect = m_trackingGeometry->closestMaterialLayer(position, direction, Trk::mappingMode, true);
-                    if (lIntersect.sIntersection.valid){
+                    const Trk::LayerIntersection<Amg::Vector3D> lIntersect 
+                        = m_trackingGeometry->closestMaterialLayer<Trk::NeutralCurvilinearParameters>(ncp, Trk::mappingMode, true);
+                    if (lIntersect.intersection.valid){
                         // the mapping positions
                         m_mappingPositionX = mapX;
                         m_mappingPositionY = mapY;
                         m_mappingPositionZ = mapZ;
                         m_mappingPositionR = mapRad;
                         // the resulting assigned position
-                        m_assignedPositionX  = lIntersect.sIntersection.intersection.x();
-                        m_assignedPositionY  = lIntersect.sIntersection.intersection.y();
-                        m_assignedPositionZ  = lIntersect.sIntersection.intersection.z();
-                        m_assignedPositionR  = lIntersect.sIntersection.intersection.perp();
+                        m_assignedPositionX  = lIntersect.intersection.position.x();
+                        m_assignedPositionY  = lIntersect.intersection.position.y();
+                        m_assignedPositionZ  = lIntersect.intersection.position.z();
+                        m_assignedPositionR  = lIntersect.intersection.position.perp();
                         m_assignedCorrection = 0.;
-                        m_assignedLayerIndex = lIntersect.layer->layerIndex().value();
-                        m_assignmentDistance = lIntersect.sIntersection.pathLength;
+                        m_assignedLayerIndex = lIntersect.object->layerIndex().value();
+                        m_assignmentDistance = lIntersect.intersection.pathLength;
                         // and now write the tree
                         m_mappingTree->Fill();
                     } else {

Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/SurfaceIntersectionTest.cxx

@@ -3,7 +3,7 @@
 */
 
 //////////////////////////////////////////////////////////////////
-// SurfaceIntersectionTest.cxx, (c) ATLAS Detector software
+// IntersectionTest.cxx, (c) ATLAS Detector software
 ///////////////////////////////////////////////////////////////////
 
 // Amg includes
@@ -100,7 +100,7 @@ StatusCode Trk::SurfaceIntersectionTest::runTest()
             return StatusCode::FAILURE;
         }
         // create the name under which the tree is registered
-        TString fullTreeName  = m_treeFolder+"SurfaceIntersection_Event";
+        TString fullTreeName  = m_treeFolder+"Intersection_Event";
                 fullTreeName += m_eventCounter;
                 fullTreeName += "_Number";
                 fullTreeName += it;
@@ -148,17 +148,17 @@ StatusCode Trk::SurfaceIntersectionTest::runTest()
             ATH_MSG_VERBOSE(" -> Line: " << Amg::toString(startPosition) << " + t * " << Amg::toString(direction));
             
             // now doing the distance estimation
-            Trk::SurfaceIntersection intersection = sf->straightLineIntersection(startPosition,direction,false);
+            Trk::Intersection intersection = sf->straightLineIntersection(startPosition,direction,false);
             ++m_surfaceAttempts[sType];
             // now check if the intesection is valid or not
             if (intersection.valid){
                 ++m_surfaceSuccessful[sType];
-                Amg::Vector3D consistency = (intersection.intersection-intersection.pathLength*direction) - startPosition;
+                Amg::Vector3D consistency = (intersection.position-intersection.pathLength*direction) - startPosition;
                 if (m_writeTTree){
-                    intersectionBranch.fill(intersection.intersection);
+                    intersectionBranch.fill(intersection.position);
                     currentTree->Fill();
                 }    
-                ATH_MSG_VERBOSE( "  -o Intersection  at " << Amg::toString(intersection.intersection) );
+                ATH_MSG_VERBOSE( "  -o Intersection  at " << Amg::toString(intersection.position) );
                 ATH_MSG_VERBOSE( "  -x Cross-checked at " << Amg::toString(consistency) );
               }
             }

Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/TrkDetDescrTPCnvTest.cxx

@@ -10,31 +10,42 @@
 #include "TrkDetDescrUnitTests/TrkDetDescrTPCnvTest.h"
 // general Trk & TrkGeometry includes
 #include "TrkDetDescrUtils/BinUtility.h"
+#include "TrkDetDescrUtils/SharedObject.h"
 #include "TrkGeometry/MaterialStepCollection.h"
 #include "TrkGeometry/LayerMaterialMap.h"
 #include "TrkGeometry/MaterialProperties.h"
 #include "TrkGeometry/BinnedLayerMaterial.h"
 #include "TrkGeometry/CompressedLayerMaterial.h"
+#include "TrkGeometry/CompoundLayerMaterial.h"
 #include "TrkGeometry/HomogeneousLayerMaterial.h"
+#include "TrkGeometry/ElementTable.h"
+#include "TrkGeometry/Material.h"
+#include <climits>
 
 Trk::TrkDetDescrTPCnvTest::TrkDetDescrTPCnvTest(const std::string& name, ISvcLocator* pSvcLocator) :
  Trk::TrkDetDescrUnitTestBase(name, pSvcLocator),
  m_writeMode(true),
  m_materialStepCollectionName("RandomMaterialSteps"),
- m_layerMaterialCollectionName("RandomLayerMaterialMap")
+ m_layerMaterialCollectionName("RandomLayerMaterialMap"),
+ m_elementTableName("RandomElementTable")
 {
     
     declareProperty("WriteMode",                    m_writeMode);
     // collection names
     declareProperty("MaterialStepCollection",       m_materialStepCollectionName);
     declareProperty("LayerMaterialMap",             m_layerMaterialCollectionName);
+    declareProperty("ElementTable",                 m_elementTableName);
 }
 
 StatusCode Trk::TrkDetDescrTPCnvTest::runTest()
 {
     ATH_MSG_VERBOSE("Running the TrkDetDescrTPCnvTest Test");
-     
-    if (m_writeMode){    
+    
+    // ----------------- WRITE MODE ----------------- 
+    if (m_writeMode){  
+        
+        ATH_MSG_VERBOSE("Test is running in write mode - writing out a file.");
+        
         // The Material STEP collection
         Trk::MaterialStepCollection* msCollection = new Trk::MaterialStepCollection;
         for (size_t it = 0; it < TrkDetDescrUnitTestBase::m_numTests; ++it ){
@@ -49,9 +60,10 @@ StatusCode Trk::TrkDetDescrTPCnvTest::runTest()
                                                           TrkDetDescrUnitTestBase::m_flatDist->shoot()));
         }    
         
+        
         ATH_MSG_VERBOSE("Recording MaterialStepCollection '" << m_materialStepCollectionName << "'.");
                 
-        if ( (evtStore()->record(msCollection, m_materialStepCollectionName)).isFailure() ) {
+        if (m_materialStepCollectionName != "" && (evtStore()->record(msCollection, m_materialStepCollectionName)).isFailure() ) {
             ATH_MSG_WARNING("Could not record the material collection " << m_materialStepCollectionName);
             return StatusCode::FAILURE;
         } 
@@ -59,8 +71,31 @@ StatusCode Trk::TrkDetDescrTPCnvTest::runTest()
         ATH_MSG_VERBOSE("Recording LayerMaterialMap '" << m_layerMaterialCollectionName << "'.");        
         
         // The LayerMaterialMap
-        Trk::LayerMaterialMap* lmMap = new Trk::LayerMaterialMap;
+        std::unique_ptr<Trk::LayerMaterialMap> lmMap(new Trk::LayerMaterialMap);
         
+        // (e) element Table
+        Trk::ElementTable* eTable = new Trk::ElementTable();
+        eTable->addElement(Trk::Material(TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                         TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                         TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                         1,
+                                         TrkDetDescrUnitTestBase::m_flatDist->shoot()),"TestMaterial1");
+         eTable->addElement(Trk::Material(TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                          TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                          TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                          2,
+                                          TrkDetDescrUnitTestBase::m_flatDist->shoot()),"TestMaterial2");
+         eTable->addElement(Trk::Material(TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                          TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                          TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                          3,
+                                          TrkDetDescrUnitTestBase::m_flatDist->shoot()),"TestMaterial3");
+        
+        if ( m_elementTableName != "" &&  (evtStore()->record(eTable, m_elementTableName)).isFailure() ) {
+             ATH_MSG_WARNING("Could not record the element table " << m_elementTableName);
+             return StatusCode::FAILURE;
+        }  
+		
         // (a) homogeneous material
         Trk::HomogeneousLayerMaterial* hml = new Trk::HomogeneousLayerMaterial(Trk::MaterialProperties(TrkDetDescrUnitTestBase::m_flatDist->shoot(),
                                                                                                        TrkDetDescrUnitTestBase::m_flatDist->shoot(),
@@ -85,17 +120,136 @@ StatusCode Trk::TrkDetDescrTPCnvTest::runTest()
                                                                            TrkDetDescrUnitTestBase::m_flatDist->shoot());
 	    (*lmMap)[Trk::LayerIndex(2)] =  new Trk::BinnedLayerMaterial(rPhiZUtility, materialMatrix, TrkDetDescrUnitTestBase::m_flatDist->shoot()) ;
         
+        // (c) compressed material
+	    Trk::BinUtility zUtility(200,-100,100, Trk::open, Trk::binZ);
+		
+		std::vector< const Trk::MaterialProperties*> materialVector; 
+		std::vector< unsigned short int >            materialIndices;
+		materialVector.reserve(200);
+		materialIndices.reserve(200);
+        for (size_t iib = 0; iib < 200; ++iib){
+			 materialIndices.push_back(int(TrkDetDescrUnitTestBase::m_flatDist->shoot()*200));
+             materialVector.push_back(new Trk::MaterialProperties(TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                                                  TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                                                  TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                                                  TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                                                  TrkDetDescrUnitTestBase::m_flatDist->shoot(),
+                                                                  TrkDetDescrUnitTestBase::m_flatDist->shoot()));
+																   
+		}														   
+        (*lmMap)[Trk::LayerIndex(3)] = new Trk::CompressedLayerMaterial(zUtility, materialVector, materialIndices);
+		
+		// (d) compound material
+	    Trk::BinUtility zUtilityC(200,-100,100, Trk::open, Trk::binZ);
+	    
+		
+		Trk::ValueMatrix thicknessMatrix;
+		Trk::ValueMatrix x0Matrix;
+		Trk::ValueMatrix l0Matrix;
+		Trk::ValueMatrix aMatrix;
+		Trk::ValueMatrix zMatrix;
+		Trk::ValueMatrix rhoMatrix;
+		thicknessMatrix.reserve(25);
+		x0Matrix.reserve(25);
+		l0Matrix.reserve(25);
+		aMatrix.reserve(25);
+		zMatrix.reserve(25);
+		rhoMatrix.reserve(25);
+
+		std::vector< std::vector< Trk::MaterialComposition > > materialCompositionMatrix;
+		
+		for (size_t iob = 0; iob < 200; ++iob){
+			// the vectors
+			std::vector<unsigned char> thicknessVector; thicknessVector.reserve(25);
+			std::vector<unsigned char> x0Vector; x0Vector.reserve(25);
+			std::vector<unsigned char> l0Vector; l0Vector.reserve(25);
+			std::vector<unsigned char> aVector; aVector.reserve(25);
+			std::vector<unsigned char> zVector; zVector.reserve(25);
+			std::vector<unsigned char> rhoVector; rhoVector.reserve(25);
+			std::vector< Trk::MaterialComposition > materialCompositionVector;
+			materialCompositionVector.reserve(25);
+			for (size_t iib = 0; iib < 25; ++iib){
+				x0Vector.push_back((unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX));
+				l0Vector.push_back((unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX));
+				aVector.push_back((unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX));
+				zVector.push_back((unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX));
+				rhoVector.push_back((unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX));
+				std::vector< Trk::ElementFraction > elements;
+				for (size_t iic = 0; iic < 5; ++iic){
+					elements.push_back(Trk::ElementFraction((unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX),
+															(unsigned char)(TrkDetDescrUnitTestBase::m_flatDist->shoot()*UCHAR_MAX)));
+				}
+				materialCompositionVector.push_back(Trk::MaterialComposition(elements));
+			}
+			thicknessMatrix.push_back(thicknessVector);
+			x0Matrix.push_back(x0Vector);
+			l0Matrix.push_back(l0Vector);
+			aMatrix.push_back(aVector);
+			zMatrix.push_back(zVector);
+			rhoMatrix.push_back(rhoVector);
+			materialCompositionMatrix.push_back(materialCompositionVector);
+		}
+		
+		Trk::ValueStore thicknessBins;
+		thicknessBins.valueMin  = 0.;
+		thicknessBins.valueStep = TrkDetDescrUnitTestBase::m_flatDist->shoot();
+		thicknessBins.valueBinMatrix = thicknessMatrix;
+					
+		Trk::ValueStore x0Bins;
+		x0Bins.valueMin  = 0.;
+		x0Bins.valueStep = TrkDetDescrUnitTestBase::m_flatDist->shoot();
+		x0Bins.valueBinMatrix = x0Matrix;
+
+		
+		Trk::ValueStore l0Bins;
+		l0Bins.valueMin  = 0.;
+		l0Bins.valueStep = TrkDetDescrUnitTestBase::m_flatDist->shoot();
+		l0Bins.valueBinMatrix = l0Matrix;
+		
+		Trk::ValueStore aBins;
+		aBins.valueMin  = 0.;
+		aBins.valueStep = TrkDetDescrUnitTestBase::m_flatDist->shoot();
+		aBins.valueBinMatrix = aMatrix;
+		
+		Trk::ValueStore zBins;
+		zBins.valueMin  = 0.;
+		zBins.valueStep = TrkDetDescrUnitTestBase::m_flatDist->shoot();
+		zBins.valueBinMatrix = zMatrix;
+		
+		Trk::ValueStore rhoBins;
+		rhoBins.valueMin  = 0.;
+		rhoBins.valueStep = TrkDetDescrUnitTestBase::m_flatDist->shoot();
+		rhoBins.valueBinMatrix = rhoMatrix;
+		
+        (*lmMap)[Trk::LayerIndex(3)] = new Trk::CompoundLayerMaterial(zUtilityC,
+                              										  thicknessBins,
+                              										  x0Bins,
+                              										  l0Bins,
+                              										  aBins,
+                              										  zBins,
+                              										  rhoBins,
+                              										  materialCompositionMatrix);
+		
+        Trk::SharedObject<const Trk::ElementTable> sharedElementTable(new Trk::ElementTable(*eTable));
+        lmMap->updateElementTable(sharedElementTable);
         
-            // (c) compressed material 
-        
-        
-        if ( (evtStore()->record(lmMap, m_layerMaterialCollectionName)).isFailure() ) {
+        if ( (evtStore()->record(lmMap.release(), m_layerMaterialCollectionName)).isFailure() ) {
              ATH_MSG_WARNING("Could not record the material collection " << m_layerMaterialCollectionName);
              return StatusCode::FAILURE;
         } 
+    } else {
+        //
+        ATH_MSG_VERBOSE("Test is running in READ mode, reading in a file.");
+        
+        // ----------------- READ MODE  -----------------
+        const Trk::LayerMaterialMap* lmMap = 0;
+        if ( (evtStore()->retrieve(lmMap, m_layerMaterialCollectionName)).isFailure() ) {
+             ATH_MSG_WARNING("Could not read the material collection " << m_layerMaterialCollectionName);
+             return StatusCode::FAILURE;
+        } else 
+            ATH_MSG_INFO("Successfully read a LayerMaterialMap with size " << lmMap->size());
+        
     }
-
-                                                                                               
                                                                                             
     return StatusCode::SUCCESS;
 }