diff --git a/Simulation/Tests/DigitizationTests/CMakeLists.txt b/Simulation/Tests/DigitizationTests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4218f37b8a00ade25cb87fab28eb8fd330d6533a
--- /dev/null
+++ b/Simulation/Tests/DigitizationTests/CMakeLists.txt
@@ -0,0 +1,38 @@
+################################################################################
+# Package: DigitizationTests
+################################################################################
+
+# Declare the package name:
+atlas_subdir( DigitizationTests )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthenaBaseComps
+ GaudiKernel
+ PRIVATE
+ Control/AthenaKernel
+ Event/EventInfo
+ Generators/GeneratorObjects
+ InnerDetector/InDetDetDescr/InDetIdentifier
+ InnerDetector/InDetRawEvent/InDetRawData
+ InnerDetector/InDetRawEvent/InDetSimData
+ TestPolicy )
+
+# External dependencies:
+find_package( Boost COMPONENTS filesystem thread system )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_component( DigitizationTests
+ src/*.cxx
+ src/components/*.cxx
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel AthenaKernel EventInfo GeneratorObjects InDetIdentifier InDetRawData InDetSimData )
+
+# Install files from the package:
+atlas_install_headers( DigitizationTests )
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+atlas_install_runtime( test/DigitizationTests_TestConfiguration.xml )
+atlas_install_scripts( scripts/*.sh )
+
diff --git a/Simulation/Tests/DigitizationTests/scripts/DigitizationCheckReferenceLocation.sh b/Simulation/Tests/DigitizationTests/scripts/DigitizationCheckReferenceLocation.sh
index 5a4eda49f221a513a869ea261777b164739845b9..08f3ce990c7df24af0ae1db41708f86c2e389c08 100755
--- a/Simulation/Tests/DigitizationTests/scripts/DigitizationCheckReferenceLocation.sh
+++ b/Simulation/Tests/DigitizationTests/scripts/DigitizationCheckReferenceLocation.sh
@@ -3,6 +3,12 @@
export DigitizationTestsVersion="dev"
if [[ $ATLAS_RELEASE_BASE == *"20.7"* ]]; then
DigitizationTestsVersion="20.7.X"
+elif [[ $ATLAS_RELEASE_BASE == *"20.20"* ]]; then
+ DigitizationTestsVersion="20.7.X"
+elif [[ $ATLAS_RELEASE_BASE == *"mig7"* ]]; then
+ DigitizationTestsVersion="20.3"
+elif [[ $ATLAS_RELEASE_BASE == *"20.3"* ]]; then
+ DigitizationTestsVersion="20.3"
elif [[ $ATLAS_RELEASE_BASE == *"20.1"* ]]; then
DigitizationTestsVersion="20.1.X"
fi
diff --git a/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.cxx b/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.cxx
index 5c5cbbee10e3d4cd64142379c07c85ff51307134..25f037b2ff19ca286422704c80e089ecc2319c47 100644
--- a/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.cxx
+++ b/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.cxx
@@ -15,7 +15,6 @@ McEventCollectionTestTool::McEventCollectionTestTool(const std::string& type,
const std::string& name,
const IInterface* parent)
: DigiTestToolBase(type, name, parent),
- m_numberOfEventsSelected(0),
m_collection("TruthEvent"), //("GEN_EVENT"),
m_nGenEvents(0),
m_nEmptyGenEvents(0),
diff --git a/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.h b/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.h
index 9f7e1a8cf23a2dc829542d589aad8b55b195a9ec..b63fc72f74131f591bdda4a7156cf9af2c4a3477 100644
--- a/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.h
+++ b/Simulation/Tests/DigitizationTests/src/McEventCollectionTestTool.h
@@ -24,7 +24,6 @@ public:
StatusCode finalize();
private:
- unsigned int m_numberOfEventsSelected;
StringProperty m_collection;
// histograms
TH1 *m_nGenEvents;
diff --git a/Simulation/Tests/DigitizationTests/src/SCT_RDOsTestTool.cxx b/Simulation/Tests/DigitizationTests/src/SCT_RDOsTestTool.cxx
index b9bc5fe22bb1e072598666204eaa87aaf0409d46..37f0b8366bf67809952a87850918b363d0d92f9b 100644
--- a/Simulation/Tests/DigitizationTests/src/SCT_RDOsTestTool.cxx
+++ b/Simulation/Tests/DigitizationTests/src/SCT_RDOsTestTool.cxx
@@ -15,13 +15,13 @@
#include <TProfile.h>
#include "AthenaKernel/errorcheck.h"
-SCT_RDOsTestTool::SCT_RDOsTestTool(const std::string& type,
- const std::string& name,
- const IInterface* parent)
+SCT_RDOsTestTool::SCT_RDOsTestTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
: DigiTestToolBase(type, name, parent),
- //m_siConditionsSvc("SCT_SiliconConditionsSvc",name),
+ //m_siConditionsSvc("SCT_SiliconConditionsSvc",name),
//m_siPropertiesSvc("SCT_SiPropertiesSvc",name),
- //m_sctmgr(NULL),
+ //m_sctmgr(NULL),
m_sctID(NULL),
m_numberOfEventsSelected(0),
m_collection("SCT_RDOs"),
@@ -46,7 +46,7 @@ SCT_RDOsTestTool::SCT_RDOsTestTool(const std::string& type,
{
//declareProperty("SiConditionsSvc", m_siConditionsSvc);
//declareProperty("SiPropertiesSvc", m_siPropertiesSvc);
- for(unsigned int i(0); i<9; ++i)
+ for(unsigned int i(0); i<9; ++i)
{
m_h_sct_endcapA_occ_layer[i]=NULL;
m_h_sct_endcapC_occ_layer[i]=NULL;
@@ -56,60 +56,60 @@ SCT_RDOsTestTool::SCT_RDOsTestTool(const std::string& type,
}
-StatusCode SCT_RDOsTestTool::initialize()
+StatusCode SCT_RDOsTestTool::initialize()
{
//Get ISiPropertiesSvc
-// if( m_siPropertiesSvc.retrieve().isFailure() )
-// {
-// return StatusCode::FAILURE;
-// }
-
+ // if( m_siPropertiesSvc.retrieve().isFailure() )
+ // {
+ // return StatusCode::FAILURE;
+ // }
+
//Get ISiliconConditionsSvc
-// if( m_siConditionsSvc.retrieve().isFailure() )
-// {
-// return StatusCode::FAILURE;
-// }
+ // if( m_siConditionsSvc.retrieve().isFailure() )
+ // {
+ // return StatusCode::FAILURE;
+ // }
// get the SCT detector manager
-// if(detStore()->retrieve(m_sctmgr,"SCT").isFailure())
-// {
-// return StatusCode::FAILURE;
-// }
+ // if(detStore()->retrieve(m_sctmgr,"SCT").isFailure())
+ // {
+ // return StatusCode::FAILURE;
+ // }
// get the SCT ID Helper
- if (detStore()->retrieve(m_sctID, "SCT_ID").isFailure())
+ if (detStore()->retrieve(m_sctID, "SCT_ID").isFailure())
{
return StatusCode::FAILURE;
}
-
+
// initialise pixel or SCT variables:
m_path+="InDet/SCT/";
- _TH1D(m_nRDO_Colls, "Number_of_SCT_RDO_Collections",1000,0,8000);
- _SET_TITLE(m_nRDO_Colls, "Number of SCT RDO Collections", "Number of SCT RDO Collections", "Frequency");
- _TH1D(m_nEmptyRDO_Colls, "Number_of_Empty_SCT_RDO_Collections",1000,0,8000);
- _SET_TITLE(m_nEmptyRDO_Colls, "Number of Empty SCT RDO Collections", "Number of Empty SCT RDO Collections", "Frequency");
- _TH1D(m_BarrelEndcap, "BarrelEndcap",10,-5.5,4.5);
- _SET_TITLE(m_BarrelEndcap, "SCT barrel/endcap", "SCT barrel/endcap", "Frequency");
- _TH1D(m_BarrelLayer, "BarrelLayer", 10,-0.5,9.5);
+ _TH1D(m_nRDO_Colls, "Number_of_SCT_RDO_Collections",1000,0,8000);
+ _SET_TITLE(m_nRDO_Colls, "Number of SCT RDO Collections", "Number of SCT RDO Collections", "Frequency");
+ _TH1D(m_nEmptyRDO_Colls, "Number_of_Empty_SCT_RDO_Collections",1000,0,8000);
+ _SET_TITLE(m_nEmptyRDO_Colls, "Number of Empty SCT RDO Collections", "Number of Empty SCT RDO Collections", "Frequency");
+ _TH1D(m_BarrelEndcap, "BarrelEndcap",10,-5.5,4.5);
+ _SET_TITLE(m_BarrelEndcap, "SCT barrel/endcap", "SCT barrel/endcap", "Frequency");
+ _TH1D(m_BarrelLayer, "BarrelLayer", 10,-0.5,9.5);
_SET_TITLE(m_BarrelLayer, "SCT barrel layer", "Layer", "Frequency");
- _TH1D(m_EndcapLayer, "EndcapLayer",25,-12.5,12.5);
+ _TH1D(m_EndcapLayer, "EndcapLayer",25,-12.5,12.5);
_SET_TITLE(m_EndcapLayer, "SCT layer(disk): endcap","SCT layer(disk): endcap", "Frequency");
- _TH1D(m_SCT_Side, "SCT_Side",25,-12.5,12.5);
+ _TH1D(m_SCT_Side, "SCT_Side",25,-12.5,12.5);
_SET_TITLE(m_SCT_Side,"SCT side: endcap/barrel/endcap","SCT side: endcap/barrel/endcap", "Frequency");
- _TH1D(m_BarrelEtaModule, "BarrelEtaModule",20,-10.5,9.5);
+ _TH1D(m_BarrelEtaModule, "BarrelEtaModule",20,-10.5,9.5);
_SET_TITLE(m_BarrelEtaModule,"SCT eta module, barrel","SCT eta module, barrel", "Frequency");
- _TH1D(m_EndcapEtaModule, "EndcapEtaModule",20,-10.5,9.5);
+ _TH1D(m_EndcapEtaModule, "EndcapEtaModule",20,-10.5,9.5);
_SET_TITLE(m_EndcapEtaModule, "SCT eta module, endcap","SCT eta module, endcap", "Frequency");
- _TH1D(m_BarrelPhiModule, "BarrelPhiModule",100,-0.5,99.5);
+ _TH1D(m_BarrelPhiModule, "BarrelPhiModule",100,-0.5,99.5);
_SET_TITLE(m_BarrelPhiModule, "SCT phi module, barrel","SCT phi module, barrel", "Frequency");
- _TH1D(m_EndcapPhiModule, "EndcapPhiModule",100,-0.5,99.5);
+ _TH1D(m_EndcapPhiModule, "EndcapPhiModule",100,-0.5,99.5);
_SET_TITLE(m_EndcapPhiModule, "SCT phi module, endcap","SCT phi module, endcap", "Frequency");
- _TH1D(m_BarrelStripNumber, "BarrelStripNumber",791,-10.5,780.5); //fill for all strips in an RDO cluster
+ _TH1D(m_BarrelStripNumber, "BarrelStripNumber",791,-10.5,780.5); //fill for all strips in an RDO cluster
_SET_TITLE(m_BarrelStripNumber, "SCT strip number, barrel","SCT strip number, barrel", "Frequency");
- _TH1D(m_EndcapStripNumber, "EndcapStripNumber",791,-10.5,780.5); //fill for all strips in an RDO cluster
+ _TH1D(m_EndcapStripNumber, "EndcapStripNumber",791,-10.5,780.5); //fill for all strips in an RDO cluster
_SET_TITLE(m_EndcapStripNumber, "SCT strip number, endcap","SCT strip number, endcap", "Frequency");
- _TH1D(m_BarrelRDOClusterSize, "BarrelRDOClusterSize",26,-0.5,25.5);
+ _TH1D(m_BarrelRDOClusterSize, "BarrelRDOClusterSize",26,-0.5,25.5);
_SET_TITLE(m_BarrelRDOClusterSize, "SCT cluster size, barrel","SCT cluster size, barrel", "Frequency");
- _TH1D(m_EndcapRDOClusterSize, "EndcapRDOClusterSize",26,-0.5,25.5);
+ _TH1D(m_EndcapRDOClusterSize, "EndcapRDOClusterSize",26,-0.5,25.5);
_SET_TITLE(m_EndcapRDOClusterSize, "SCT cluster size, endcap","SCT cluster size, endcap", "Frequency");
_TH1D(m_BarrelOccupancyByLayer , "BarrelOccupancyByLayer", 4,0.5,4.5);
_SET_TITLE(m_BarrelOccupancyByLayer , "SCT Barrel Occupancy By Layer (%)", "Layer", "SCT Barrel Occupancy [%]");
@@ -152,10 +152,10 @@ StatusCode SCT_RDOsTestTool::processEvent() {
CHECK(this->CheckSDOs());
const SCT_RDO_Container* p_rdocontainer;
- if(evtStore()->retrieve(p_rdocontainer, m_collection).isFailure())
+ if(evtStore()->retrieve(p_rdocontainer, m_collection).isFailure())
{
return StatusCode::SUCCESS;
- }
+ }
++m_numberOfEventsSelected;
int NumberModulesVetoed[5]={0,0,0,0,0};
unsigned int n_sctColl(0);
@@ -164,161 +164,160 @@ StatusCode SCT_RDOsTestTool::processEvent() {
// loop over RDO collection
SCT_RDO_Container::const_iterator col_it(p_rdocontainer->begin());
const SCT_RDO_Container::const_iterator lastCol(p_rdocontainer->end());
- while(col_it!= lastCol)
+ while(col_it!= lastCol)
{
const InDetRawDataCollection<SCT_RDORawData>* SCT_Collection(*col_it);
- if(!SCT_Collection)
- {
- ++col_it;
- continue; // select only SCT RDO's
- }
+ if(!SCT_Collection)
+ {
+ ++col_it;
+ continue; // select only SCT RDO's
+ }
++n_sctColl;
-
- if(SCT_Collection->empty())
- {
- ++col_it;
- continue;
- }
+
+ if(SCT_Collection->empty())
+ {
+ ++col_it;
+ continue;
+ }
++n_sctCollNonEmpty;
bool NoiseOnly(true); // want this to be valid for each module (side in this case)
int module_type(-1);
- DataVector<SCT_RDORawData>::const_iterator p_rdo(SCT_Collection->begin());
+ DataVector<SCT_RDORawData>::const_iterator p_rdo(SCT_Collection->begin());
const DataVector<SCT_RDORawData>::const_iterator endOfRDOs(SCT_Collection->end());
- for( ; p_rdo!=endOfRDOs ; ++p_rdo)
- {
- module_type = -1;
- const Identifier rdoId((*p_rdo)->identify());
- ATH_MSG_VERBOSE ("RDO ID=" << m_sctID->show_to_string( (*p_rdo)->identify())
- << ", BarrelEndcap =" << m_sctID->barrel_ec(rdoId)
- << ", LayerWheel =" << m_sctID->layer_disk(rdoId)
- << ", EtaModule =" << m_sctID->eta_module(rdoId)
- << ", PhiModule =" << m_sctID->phi_module(rdoId)
- << ", Side =" << m_sctID->side(rdoId)
- << ", Strip =" << m_sctID->strip(rdoId)
- << ", Strip =" << (*p_rdo)->getStrip()
- << ", Cluster size =" << (*p_rdo)->getGroupSize()
- );
- // Fill histograms
- const int sctBarrel(m_sctID->barrel_ec(rdoId));
- const int sctLayer (m_sctID->layer_disk(rdoId));
- const int sctEtaMod(m_sctID->eta_module(rdoId));
- const int sctPhiMod(m_sctID->phi_module(rdoId));
- const int sctSide (m_sctID->side(rdoId));
- const int clusterSize((*p_rdo)->getGroupSize());
- m_BarrelEndcap->Fill(sctBarrel,1);
- if(sctBarrel==0)
- {
- m_BarrelLayer->Fill(sctLayer,1);
- m_BarrelEtaModule->Fill(sctEtaMod,1);
- m_BarrelPhiModule->Fill(sctPhiMod,1);
- m_SCT_Side->Fill(sctSide,1);
- //Add an entry for all strips represented by each RDO
- const int firstStrip(m_sctID->strip(rdoId));
- for(int clusterStrip(0); clusterStrip<clusterSize; ++clusterStrip)
- {
- m_BarrelStripNumber->Fill((firstStrip+clusterStrip),1);
- }
- m_BarrelRDOClusterSize->Fill(clusterSize,1);
- //Occupancy
- if(sctLayer>=0) m_h_sct_barrel_occ_layer[sctLayer]->Fill(sctEtaMod,sctPhiMod,clusterSize);
- //Check for SDOs in this module.
- int tempEtaMod(sctEtaMod);
- if(tempEtaMod<0) ++tempEtaMod;
- tempEtaMod = tempEtaMod + 5; // puts eta module number in range 0-11
- const int index(2*(240*tempEtaMod+60*sctLayer+sctPhiMod)+sctSide);
- if(NoBarrelModules.count(index)==1) NoiseOnly = false;
- if(NoiseOnly)
- {
- module_type=4;
- m_SCT_OccupancyByModuleType->Fill(module_type,clusterSize);//Barrel <-> 4
- }
- }
- if(sctBarrel!= 0)
- {
- m_EndcapLayer->Fill(sctLayer,1);
- m_EndcapEtaModule->Fill(sctEtaMod,1);
- m_EndcapPhiModule->Fill(sctPhiMod,1);
- //Add an entry for all strips represented by each RDO
- const int firstStrip(m_sctID->strip(rdoId));
- for(int clusterStrip(0); clusterStrip<clusterSize; ++clusterStrip)
- {
- m_EndcapStripNumber->Fill((firstStrip+clusterStrip),1);
- }
- m_EndcapRDOClusterSize->Fill(clusterSize,1);
-
- if(sctBarrel==-2)
- {//Endcap C histograms
- m_SCT_Side->Fill(-10+sctSide,1);
- m_EndcapLayer->Fill(-10+sctLayer,1);
- //Occupancy
- if(sctLayer>=0)
- {
- m_h_sct_endcapC_occ_layer[sctLayer]->Fill(sctEtaMod,sctPhiMod,clusterSize);
- }
-
- }
- if(sctBarrel==2)
- {//Endcap A histograms
- m_SCT_Side->Fill( 10+sctSide,1);
- m_EndcapLayer->Fill( sctLayer,1);
- //Occupancy
- if(sctLayer>=0)
- {
- m_h_sct_endcapA_occ_layer[sctLayer]->Fill(sctEtaMod,sctPhiMod,clusterSize);
- }
- }
-
-
- //Module_type <-> Integer
- //Barrel <-> 4
- //Inner <-> 3
- //Middles <-> 2
- //Short Middles<-> 1
- //Outer <-> 0
-
- //TODO loop over SDOs to check this part....
- const int index(2*((1000*(2+sctBarrel))+(60*sctLayer+sctPhiMod))+sctSide);
- if(sctEtaMod==2)
- {
- module_type = 3; // inner modules
- if(NoInnerModules.count(index)==1) NoiseOnly=false;
- }
- if(sctEtaMod==1)
- {
- module_type = 2; // middle modules
- if(sctLayer==7)
- {
- module_type = 1; // short middle modules
- if(NoShortMiddleModules.count(index)==1) NoiseOnly=false;
- }
- else
- {
- if(NoMiddleModules.count(index)==1) NoiseOnly=false;
- }
- }
- if(sctEtaMod==0)
- {
- module_type = 0; // outer modules
- if(NoOuterModules.count(index)==1) NoiseOnly=false;
- }
- if(NoiseOnly) m_SCT_OccupancyByModuleType->Fill(module_type, clusterSize);
-
- }
-
- }
- if(!NoiseOnly)
- {
- if(module_type!=-1) { NumberModulesVetoed[module_type]+=1; }
- }
-
+ for( ; p_rdo!=endOfRDOs ; ++p_rdo)
+ {
+ module_type = -1;
+ const Identifier rdoId((*p_rdo)->identify());
+ ATH_MSG_VERBOSE ("RDO ID=" << m_sctID->show_to_string( (*p_rdo)->identify())
+ << ", BarrelEndcap =" << m_sctID->barrel_ec(rdoId)
+ << ", LayerWheel =" << m_sctID->layer_disk(rdoId)
+ << ", EtaModule =" << m_sctID->eta_module(rdoId)
+ << ", PhiModule =" << m_sctID->phi_module(rdoId)
+ << ", Side =" << m_sctID->side(rdoId)
+ << ", Strip =" << m_sctID->strip(rdoId)
+ << ", Cluster size =" << (*p_rdo)->getGroupSize()
+ );
+ // Fill histograms
+ const int sctBarrel(m_sctID->barrel_ec(rdoId));
+ const int sctLayer (m_sctID->layer_disk(rdoId));
+ const int sctEtaMod(m_sctID->eta_module(rdoId));
+ const int sctPhiMod(m_sctID->phi_module(rdoId));
+ const int sctSide (m_sctID->side(rdoId));
+ const int clusterSize((*p_rdo)->getGroupSize());
+ m_BarrelEndcap->Fill(sctBarrel,1);
+ if(sctBarrel==0)
+ {
+ m_BarrelLayer->Fill(sctLayer,1);
+ m_BarrelEtaModule->Fill(sctEtaMod,1);
+ m_BarrelPhiModule->Fill(sctPhiMod,1);
+ m_SCT_Side->Fill(sctSide,1);
+ //Add an entry for all strips represented by each RDO
+ const int firstStrip(m_sctID->strip(rdoId));
+ for(int clusterStrip(0); clusterStrip<clusterSize; ++clusterStrip)
+ {
+ m_BarrelStripNumber->Fill((firstStrip+clusterStrip),1);
+ }
+ m_BarrelRDOClusterSize->Fill(clusterSize,1);
+ //Occupancy
+ if(sctLayer>=0) m_h_sct_barrel_occ_layer[sctLayer]->Fill(sctEtaMod,sctPhiMod,clusterSize);
+ //Check for SDOs in this module.
+ int tempEtaMod(sctEtaMod);
+ if(tempEtaMod<0) ++tempEtaMod;
+ tempEtaMod = tempEtaMod + 5; // puts eta module number in range 0-11
+ const int index(2*(240*tempEtaMod+60*sctLayer+sctPhiMod)+sctSide);
+ if(NoBarrelModules.count(index)==1) NoiseOnly = false;
+ if(NoiseOnly)
+ {
+ module_type=4;
+ m_SCT_OccupancyByModuleType->Fill(module_type,clusterSize);//Barrel <-> 4
+ }
+ }
+ if(sctBarrel!= 0)
+ {
+ m_EndcapLayer->Fill(sctLayer,1);
+ m_EndcapEtaModule->Fill(sctEtaMod,1);
+ m_EndcapPhiModule->Fill(sctPhiMod,1);
+ //Add an entry for all strips represented by each RDO
+ const int firstStrip(m_sctID->strip(rdoId));
+ for(int clusterStrip(0); clusterStrip<clusterSize; ++clusterStrip)
+ {
+ m_EndcapStripNumber->Fill((firstStrip+clusterStrip),1);
+ }
+ m_EndcapRDOClusterSize->Fill(clusterSize,1);
+
+ if(sctBarrel==-2)
+ {//Endcap C histograms
+ m_SCT_Side->Fill(-10+sctSide,1);
+ m_EndcapLayer->Fill(-10+sctLayer,1);
+ //Occupancy
+ if(sctLayer>=0)
+ {
+ m_h_sct_endcapC_occ_layer[sctLayer]->Fill(sctEtaMod,sctPhiMod,clusterSize);
+ }
+
+ }
+ if(sctBarrel==2)
+ {//Endcap A histograms
+ m_SCT_Side->Fill( 10+sctSide,1);
+ m_EndcapLayer->Fill( sctLayer,1);
+ //Occupancy
+ if(sctLayer>=0)
+ {
+ m_h_sct_endcapA_occ_layer[sctLayer]->Fill(sctEtaMod,sctPhiMod,clusterSize);
+ }
+ }
+
+
+ //Module_type <-> Integer
+ //Barrel <-> 4
+ //Inner <-> 3
+ //Middles <-> 2
+ //Short Middles<-> 1
+ //Outer <-> 0
+
+ //TODO loop over SDOs to check this part....
+ const int index(2*((1000*(2+sctBarrel))+(60*sctLayer+sctPhiMod))+sctSide);
+ if(sctEtaMod==2)
+ {
+ module_type = 3; // inner modules
+ if(NoInnerModules.count(index)==1) NoiseOnly=false;
+ }
+ if(sctEtaMod==1)
+ {
+ module_type = 2; // middle modules
+ if(sctLayer==7)
+ {
+ module_type = 1; // short middle modules
+ if(NoShortMiddleModules.count(index)==1) NoiseOnly=false;
+ }
+ else
+ {
+ if(NoMiddleModules.count(index)==1) NoiseOnly=false;
+ }
+ }
+ if(sctEtaMod==0)
+ {
+ module_type = 0; // outer modules
+ if(NoOuterModules.count(index)==1) NoiseOnly=false;
+ }
+ if(NoiseOnly) m_SCT_OccupancyByModuleType->Fill(module_type, clusterSize);
+
+ }
+
+ }
+ if(!NoiseOnly)
+ {
+ if(module_type!=-1) { NumberModulesVetoed[module_type]+=1; }
+ }
+
++col_it;
}
m_nRDO_Colls->Fill(n_sctColl,1);
m_nEmptyRDO_Colls->Fill(n_sctColl-n_sctCollNonEmpty,1);
- ATH_MSG_DEBUG ("Found " << n_sctColl << " SCT RDO collections, of which " << n_sctCollNonEmpty << " were non-empty");
- ATH_MSG_DEBUG ("Number of Module sides vetoed from noise plots: Outer(" << NumberModulesVetoed[0] << "), Short Middle(" << NumberModulesVetoed[1]
- << "), Middle(" << NumberModulesVetoed[2] << "), Inner(" << NumberModulesVetoed[3] << "), Barrel(" << NumberModulesVetoed[4] << ") ");
+ ATH_MSG_DEBUG ("Found " << n_sctColl << " SCT RDO collections, of which " << n_sctCollNonEmpty << " were non-empty");
+ ATH_MSG_DEBUG ("Number of Module sides vetoed from noise plots: Outer(" << NumberModulesVetoed[0] << "), Short Middle(" << NumberModulesVetoed[1]
+ << "), Middle(" << NumberModulesVetoed[2] << "), Inner(" << NumberModulesVetoed[3] << "), Barrel(" << NumberModulesVetoed[4] << ") ");
return StatusCode::SUCCESS;
}
@@ -342,11 +341,11 @@ StatusCode SCT_RDOsTestTool::CheckSDOs() {
if(msgLvl(MSG::VERBOSE))
{
std::cout << " B L P E S Str Status Evt Trk Chg"
- << std::endl;
+ << std::endl;
}
InDetSimDataCollection::const_iterator itSDO(simDataMapSCT->begin());
const InDetSimDataCollection::const_iterator endOfSDOs(simDataMapSCT->end());
- for(; itSDO!=endOfSDOs; ++itSDO)
+ for(; itSDO!=endOfSDOs; ++itSDO)
{
const Identifier sdoId((*itSDO).first);
const int sctBarrel(m_sctID->barrel_ec(sdoId));
@@ -357,78 +356,78 @@ StatusCode SCT_RDOsTestTool::CheckSDOs() {
//const int sctStrip (m_sctID->strip(sdoId));
if(sctBarrel==0)
- {
- int tempEtaMod(sctEtaMod);
- if(tempEtaMod<0) ++tempEtaMod;
- tempEtaMod = tempEtaMod + 5; // puts eta module number in range 0-11
- const int index(2*(240*tempEtaMod+60*sctLayer+sctPhiMod)+sctSide);
- NoBarrelModules[index]=1;
- }
- if(sctBarrel!= 0)
- {
- //Module_type <-> Integer
- //Barrel <-> 4
- //Inner <-> 3
- //Middles <-> 2
- //Short Middles<-> 1
- //Outer <-> 0
- const int index(2*((1000*(2+sctBarrel))+(60*sctLayer+sctPhiMod))+sctSide);
- if(sctEtaMod==2)
- {
- NoInnerModules[index]=1;
- }
- if(sctEtaMod==1)
- {
- if(sctLayer==7)
- {
- NoShortMiddleModules[index]=1;
- }
- else
- {
- NoMiddleModules[index]=1;
- }
- }
- if(sctEtaMod==0)
- {
- NoOuterModules[index]=1;
- }
- }
+ {
+ int tempEtaMod(sctEtaMod);
+ if(tempEtaMod<0) ++tempEtaMod;
+ tempEtaMod = tempEtaMod + 5; // puts eta module number in range 0-11
+ const int index(2*(240*tempEtaMod+60*sctLayer+sctPhiMod)+sctSide);
+ NoBarrelModules[index]=1;
+ }
+ if(sctBarrel!= 0)
+ {
+ //Module_type <-> Integer
+ //Barrel <-> 4
+ //Inner <-> 3
+ //Middles <-> 2
+ //Short Middles<-> 1
+ //Outer <-> 0
+ const int index(2*((1000*(2+sctBarrel))+(60*sctLayer+sctPhiMod))+sctSide);
+ if(sctEtaMod==2)
+ {
+ NoInnerModules[index]=1;
+ }
+ if(sctEtaMod==1)
+ {
+ if(sctLayer==7)
+ {
+ NoShortMiddleModules[index]=1;
+ }
+ else
+ {
+ NoMiddleModules[index]=1;
+ }
+ }
+ if(sctEtaMod==0)
+ {
+ NoOuterModules[index]=1;
+ }
+ }
if(msgLvl(MSG::VERBOSE))
- {
- const InDetSimData& sdo((*itSDO).second);
- ATH_MSG_VERBOSE (" SCT SDO first=" << m_sctID->show_to_string(sdoId) << ", word=" << sdo.word());
- const std::vector< std::pair<HepMcParticleLink,float> >& deposits = sdo.getdeposits();
-
- // Loop over deposits for this SDO
- std::vector< std::pair<HepMcParticleLink,float> >::const_iterator itDep(deposits.begin());
- const std::vector< std::pair<HepMcParticleLink,float> >::const_iterator endOfDeposits(deposits.end());
- for( ; itDep!=endOfDeposits; ++itDep)
- {
- const HepMcParticleLink& particleLink = (*itDep).first;
- const float charge = (*itDep).second;
- ATH_MSG_VERBOSE (" event index=" << particleLink.eventIndex() << " barcode=" << particleLink.barcode() << ", charge=" << charge);
-
- std::cout << std::setw(3) << m_sctID->barrel_ec(sdoId)
- << std::setw(3) << m_sctID->layer_disk(sdoId)
- << std::setw(3) << m_sctID->phi_module(sdoId)
- << std::setw(3) << m_sctID->eta_module(sdoId)
- << std::setw(3) << m_sctID->side(sdoId)
- << std::setw(5) << m_sctID->strip(sdoId)
- << std::hex << std::showbase
- << std::setw(9) << sdo.word()
- << std::dec << std::noshowbase
- << std::setw(2) << SCT_SimHelper::isNoise(sdo)
- << std::setw(2) << SCT_SimHelper::isBelowThreshold(sdo)
- << std::setw(2) << SCT_SimHelper::isDisabled(sdo)
- << std::setw(5) << particleLink.eventIndex()
- << std::setw(7) << particleLink.barcode()
- << std::fixed << std::showpoint << std::setprecision(1)
- << std::setw(10) << charge
- << std::endl;
- ias.restore();
- }
- }
+ {
+ const InDetSimData& sdo((*itSDO).second);
+ ATH_MSG_VERBOSE (" SCT SDO first=" << m_sctID->show_to_string(sdoId) << ", word=" << sdo.word());
+ const std::vector< std::pair<HepMcParticleLink,float> >& deposits = sdo.getdeposits();
+
+ // Loop over deposits for this SDO
+ std::vector< std::pair<HepMcParticleLink,float> >::const_iterator itDep(deposits.begin());
+ const std::vector< std::pair<HepMcParticleLink,float> >::const_iterator endOfDeposits(deposits.end());
+ for( ; itDep!=endOfDeposits; ++itDep)
+ {
+ const HepMcParticleLink& particleLink = (*itDep).first;
+ const float charge = (*itDep).second;
+ ATH_MSG_VERBOSE (" event index=" << particleLink.eventIndex() << " barcode=" << particleLink.barcode() << ", charge=" << charge);
+
+ std::cout << std::setw(3) << m_sctID->barrel_ec(sdoId)
+ << std::setw(3) << m_sctID->layer_disk(sdoId)
+ << std::setw(3) << m_sctID->phi_module(sdoId)
+ << std::setw(3) << m_sctID->eta_module(sdoId)
+ << std::setw(3) << m_sctID->side(sdoId)
+ << std::setw(5) << m_sctID->strip(sdoId)
+ << std::hex << std::showbase
+ << std::setw(9) << sdo.word()
+ << std::dec << std::noshowbase
+ << std::setw(2) << SCT_SimHelper::isNoise(sdo)
+ << std::setw(2) << SCT_SimHelper::isBelowThreshold(sdo)
+ << std::setw(2) << SCT_SimHelper::isDisabled(sdo)
+ << std::setw(5) << particleLink.eventIndex()
+ << std::setw(7) << particleLink.barcode()
+ << std::fixed << std::showpoint << std::setprecision(1)
+ << std::setw(10) << charge
+ << std::endl;
+ ias.restore();
+ }
+ }
}
m_NumberModulesVetoed[0] += NoOuterModules.size();
@@ -436,8 +435,8 @@ StatusCode SCT_RDOsTestTool::CheckSDOs() {
m_NumberModulesVetoed[2] += NoMiddleModules.size();
m_NumberModulesVetoed[3] += NoInnerModules.size();
m_NumberModulesVetoed[4] += NoBarrelModules.size();
- ATH_MSG_DEBUG ("Number of Module sides with True Track Hits: Outer(" << NoOuterModules.size() << "), Short Middle(" << NoShortMiddleModules.size()
- << "), Middle(" << NoMiddleModules.size() << "), Inner(" << NoInnerModules.size() << "), Barrel(" << NoBarrelModules.size() << ") ");
+ ATH_MSG_DEBUG ("Number of Module sides with True Track Hits: Outer(" << NoOuterModules.size() << "), Short Middle(" << NoShortMiddleModules.size()
+ << "), Middle(" << NoMiddleModules.size() << "), Inner(" << NoInnerModules.size() << "), Barrel(" << NoBarrelModules.size() << ") ");
return StatusCode::SUCCESS;
}
@@ -453,15 +452,15 @@ double SCT_RDOsTestTool::GetBarrelOccupancy(const TH2* hist, const int layer, co
for(int x =1; x<=hist->GetNbinsX(); ++x)
{
for(int y =1; y<=hist->GetNbinsY(); ++y)
- {
- double content = hist->GetBinContent(x,y);
- if(content>0.) occ+= content;
- }
+ {
+ double content = hist->GetBinContent(x,y);
+ if(content>0.) occ+= content;
+ }
}
error = pow(occ,0.5);
ATH_MSG_VERBOSE ("Barrel Layer: "<<layer<<" Occupancy = "<<occ<<" +/- "<<error<<" Scale = "<<scale);
- occ/=scale; error/=scale;
- occ*=100.; error*=100.; //scale to a percentage
+ occ/=scale; error/=scale;
+ occ*=100.; error*=100.; //scale to a percentage
ATH_MSG_VERBOSE ("Barrel Layer: "<<layer<<" Percentage Occupancy = "<<occ<<" +/- "<<error);
return occ;
@@ -480,21 +479,21 @@ double SCT_RDOsTestTool::GetEndcapOccupancy(const TH2* hist, const int disk, con
for(int x =1; x<=hist->GetNbinsX(); ++x)
{
for(int y =1; y<=hist->GetNbinsY(); ++y)
- {
- double content = hist->GetBinContent(x,y);
- if(content>0.) occ+= content;
- }
+ {
+ double content = hist->GetBinContent(x,y);
+ if(content>0.) occ+= content;
+ }
}
error = pow(occ,0.5);
ATH_MSG_VERBOSE ("Endcap Disk: "<<disk<<" No. modules = "<<nmodules<<" Occupancy = "<<occ<<" +/- "<<error<<" Scale = "<<scale);
occ/=scale; error/=scale;
- occ*=100.; error*=100.; //scale to a percentage
+ occ*=100.; error*=100.; //scale to a percentage
ATH_MSG_VERBOSE ("Endcap Disk: "<<disk<<" No. modules = "<<nmodules<<" Percentage Occupancy = "<<occ<<" +/- "<<error);
return occ;
}
-StatusCode SCT_RDOsTestTool::finalize()
+StatusCode SCT_RDOsTestTool::finalize()
{
double basescale(static_cast<double>(m_numberOfEventsSelected));
basescale*=1536.0; // nstrips per _module_
diff --git a/Simulation/Tests/DigitizationTests/test/DigitizationTests_TestConfiguration.xml b/Simulation/Tests/DigitizationTests/test/DigitizationTests_TestConfiguration.xml
index 50520d4d942a4fc2e6517c3b7de3d12862bbf949..447f146c6b1e70504ae307c75c611c09646f762d 100755
--- a/Simulation/Tests/DigitizationTests/test/DigitizationTests_TestConfiguration.xml
+++ b/Simulation/Tests/DigitizationTests/test/DigitizationTests_TestConfiguration.xml
@@ -101,7 +101,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2011_ttbar_no_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2011_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -152,7 +152,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2012_ttbar_no_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2012_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -182,7 +182,7 @@
<jobTransformJobName>DigitizationRTT_JobTransforms</jobTransformJobName>
<jobTransformCmd>DigitizationTestsCompFile='mc15_2015_ttbar_no_pileup.RDO.pool.root';source DigitizationCheckReferenceLocation.sh;echo ${DigitizationTestsCompFile}; echo ${DigitizationTestsVersion}; xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigitizationTestsCompFile DiffPool_Comp.pool.root; Digi_tf.py --inputHITSFile root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._001041.pool.root.1 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --maxEvents 25 --skipEvents 0 --digiSeedOffset1 11 --digiSeedOffset2 22 --geometryVersion ATLAS-R2-2015-03-01-00 --conditionsTag default:OFLCOND-RUN12-SDR-25 --DataRunNumber 222500 --postInclude 'default:PyJobTransforms/UseFrontier.py'
</jobTransformCmd>
- <group>DigitizationTests:DigitizationTests_JobTransforms</group>
+ <group>DigitizationTests:DigitizationTests_JobTransforms_2015</group>
<queue>medium</queue>
<test>
<modulename>FlexibleDiffPoolFilesRunner</modulename>
@@ -203,7 +203,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_no_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -254,7 +254,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_noNoise.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -304,7 +304,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_50ns_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -356,7 +356,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_50ns_pileup_lowMu.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -408,7 +408,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_50ns_pileup_noNoise.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -462,7 +462,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_50ns_algs_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -513,7 +513,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_25ns_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -565,7 +565,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_25ns_pileup_noNoise.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -617,7 +617,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_ttbar_25ns_algs_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -669,7 +669,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_2015_cosmics.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_cosmics.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -722,7 +722,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_ttbar_LVL1_on.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -775,7 +775,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_ttbar_LVL1_on_noNoise.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -827,7 +827,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_ttbar_LVL1_on_50ns_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -881,7 +881,7 @@
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_ttbar_LVL1_on_25ns_pileup.RDO.pool.root--></argvalue>
</arg>
- <keepFilePattern>mc15_2010_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
@@ -1100,7 +1100,56 @@
</arg>
<keepFilePattern>randomStreamCheck.log</keepFilePattern>
</test>
+
</jobGroup>
+ <jobGroup name="DigitizationTests_JobTransforms_2015" parent="Transform">
+ <keepFilePattern>*.root</keepFilePattern>
+ <keepFilePattern>*.out</keepFilePattern>
+ <keepFilePattern>log*</keepFilePattern>
+ <keepFilePattern>*log</keepFilePattern>
+ <keepFilePattern>*.diffPool</keepFilePattern>
+ <keepFilePattern>*.checkFile</keepFilePattern>
+ <keepFilePattern>*.html</keepFilePattern>
+ <keepFilePattern>prof/*.html</keepFilePattern>
+ <keepFilePattern>test.athena.profile</keepFilePattern>
+ <keepFilePattern>athena.profile.txt</keepFilePattern>
+ <test>
+ <modulename>RttLibraryTools</modulename>
+ <testname>FileGrepper</testname>
+ <testidentifier>RandomStreamChecker</testidentifier>
+ <arg>
+ <argname>inputFile</argname>
+ <argvalue>log.HITtoRDO</argvalue>
+ </arg>
+ <arg>
+ <argname>outputFile</argname>
+ <argvalue>randomStreamCheck.log</argvalue>
+ </arg>
+ <arg>
+ <argname>vetoList</argname>
+ <argvalue>stream with DEFAULT seeds</argvalue>
+ </arg>
+ <keepFilePattern>randomStreamCheck.log</keepFilePattern>
+ </test>
+ <test>
+ <modulename>RttLibraryTools</modulename>
+ <testname>DiffPoolFilesRunner</testname>
+ <outputFile>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.Basic.root.diffPool</outputFile>
+ <testidentifier>HITS_RegressionTestRunner</testidentifier>
+ <arg>
+ <argname>fileName</argname>
+ <argvalue>mc15_2015_ttbar.RDO.pool.root</argvalue>
+ </arg>
+ <arg>
+ <argname>refFileName</argname>
+ <argvalue>DiffPool_Comp.pool.root</argvalue>
+ </arg>
+ <keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.Basic.root.diffPool</keepFilePattern>
+ </test>
+
+
+ </jobGroup>
+
<jobGroup name="DigitizationRegressionTests" parent="RTT:Top">
<!--<keepFilePattern>*.root</keepFilePattern>-->
<keepFilePattern>*.txt</keepFilePattern>