diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9de6be441a32f781e3d62222f2c6134e0dc3bb78..4e9c688312e4180f48f5f64f0ac341345ac41f9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ test_unittest:
tags:
- k8s-cvmfs
script:
- - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; source `find . -name 'setup.sh'`; cd build; ctest -j3" && set -e
+ - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; source `find . -name 'setup.sh'`; cd build; ctest -j3 --output-on-failure" && set -e
- echo $ALRB_CONT_RUNPAYLOAD
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh -c alma9 && set -e
dependencies:
diff --git a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
index 85b56fe61a7829394e71284363448595df47d0d1..dcac4a5dd9000c20c84577ada81fdb4ae8b4a3c1 100644
--- a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
+++ b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
@@ -64,10 +64,5 @@ def CaloWaveformDigitizationOutputCfg(flags, **kwargs):
ItemList = [
"RawWaveformContainer#*"
]
- acc.merge(OutputStreamCfg(flags, "RDO"))
- ostream = acc.getEventAlgo("OutputStreamRDO")
- # ostream.TakeItemsFromInput = True # Copies all data from input file to output
- # ostream.TakeItemsFromInput = False
- # Try turning this off
- ostream.ItemList += ItemList
+ acc.merge(OutputStreamCfg(flags, "RDO", ItemList))
return acc
diff --git a/Control/CalypsoExample/Digitization/CMakeLists.txt b/Control/CalypsoExample/Digitization/CMakeLists.txt
index bf7afee06a4381117ab59b11b1a2d4d3f92df5b9..d9b9a6bf4b19e3c142c367b3416283e9e047babb 100644
--- a/Control/CalypsoExample/Digitization/CMakeLists.txt
+++ b/Control/CalypsoExample/Digitization/CMakeLists.txt
@@ -9,7 +9,8 @@ atlas_subdir( Digitization )
atlas_install_scripts( scripts/*.sh scripts/*.py )
atlas_add_test( ProdDigi
- SCRIPT scripts/faser_digi.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/FaserMC-MC22_PG_muon_fasernu_100GeV-100012-00000-HITS.root
- PROPERTIES TIMEOUT 300 )
+ SCRIPT scripts/faser_digi.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/FaserMC-MC24_PG_muon_fasernu_100GeV-100012-00000-HITS.root
+ POST_EXEC_SCRIPT nopost.sh
+ PROPERTIES TIMEOUT 300 )
diff --git a/Control/CalypsoExample/Digitization/scripts/faser_digi.py b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
index cdd58d611d21159b5e8f378f58182855bb477194..6cd1f1b13700cfa43987fb90fdc0afb885394c3f 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
@@ -70,7 +70,7 @@ configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
-configFlags.Digitization.TruthOutput = True
+configFlags.Digitization.EnableTruth = True
# TI12 old geometry
if runtype == "TI12OldMC":
diff --git a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
index 926dfdd4866fb79d0430f6348580a15f8e3752d2..8fc647943e0d9b44b9457dfe12c4d987149f064b 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
@@ -180,7 +180,7 @@ configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
-configFlags.Digitization.TruthOutput = True
+configFlags.Digitization.EnableTruth = True
# TI12 old geometry
if runtype == "TI12OldMC":
configFlags.GeoModel.FaserVersion = "FASER-01"
diff --git a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
index b3206fe4283c8bf7f7c1b5739d42fbc0ae003274..26996abe453e6e6da7787c806517d677c8896257 100755
--- a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
@@ -66,6 +66,8 @@ if __name__ == '__main__':
#
# More config flags (R24)
#
+ from Campaigns.Utils import Campaign
+ from AthenaConfiguration.Enums import BeamType
configFlags.Common.MsgSourceLength = 30
configFlags.Input.MCCampaign = Campaign.Unknown
configFlags.Input.TypedCollections = []
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index 3c990f39bdb1014c58ff079a82998e9810645b90..8923c532622198918c71536fe191008f5a0b38c1 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -46,6 +46,12 @@ parser.add_argument("--isOverlay", action='store_true',
help="Set overlaid data input")
parser.add_argument("--noTracking", action='store_true',
help="Turn off tracking (for R24 debugging)")
+parser.add_argument("--noIFT", action='store_true',
+ help="Turn off 4-station tracking")
+parser.add_argument("--noForward", action='store_true',
+ help="Turn off forward CKF tracking")
+parser.add_argument("--noBackward", action='store_true',
+ help="Turn off backward CKF tracking")
args = parser.parse_args()
@@ -271,34 +277,38 @@ if useCKF:
# Do both forward and backward tracking
from FaserActsKalmanFilter.CKF2Config import CKF2Cfg
- if not args.isOverlay:
+ if not args.isOverlay and not args.noIFT:
# 4-station tracking forward
- acc.merge(CKF2Cfg(configFlags,
- actsOutputTag=f"{filestem}_4station_forward",
- noDiagnostics=True))
+ if not args.noForward:
+ acc.merge(CKF2Cfg(configFlags,
+ actsOutputTag=f"{filestem}_4station_forward",
+ noDiagnostics=True))
# 4-station tracking backward
- acc.merge(CKF2Cfg(configFlags, name="CKF_Back",
- actsOutputTag=f"{filestem}_4station_backward",
- OutputCollection="CKFTrackCollectionBackward",
- BackwardPropagation=True,
+ if not args.noBackward:
+ acc.merge(CKF2Cfg(configFlags, name="CKF_Back",
+ actsOutputTag=f"{filestem}_4station_backward",
+ OutputCollection="CKFTrackCollectionBackward",
+ BackwardPropagation=True,
+ noDiagnostics=True))
+
+
+ # Add tracking collection with no IFT
+ if not args.noForward:
+ acc.merge(CKF2Cfg(configFlags, maskedLayers=[0, 1, 2], name="CKF_woIFT",
+ actsOutputTag=f"{filestem}_3station_forward",
+ OutputCollection="CKFTrackCollectionWithoutIFT",
+ BackwardPropagation=False,
noDiagnostics=True))
- # Add tracking collection with no IFT
- acc.merge(CKF2Cfg(configFlags, maskedLayers=[0, 1, 2], name="CKF_woIFT",
- actsOutputTag=f"{filestem}_3station_forward",
- OutputCollection="CKFTrackCollectionWithoutIFT",
- BackwardPropagation=False,
- noDiagnostics=True))
-
-
# Backward tracking with no IFT
- acc.merge(CKF2Cfg(configFlags, maskedLayers=[0, 1, 2], name="CKF_Back_woIFT",
- actsOutputTag=f"{filestem}_3station_backward",
- OutputCollection="CKFTrackCollectionBackwardWithoutIFT",
- BackwardPropagation=True,
- noDiagnostics=True))
+ if not args.noBackward:
+ acc.merge(CKF2Cfg(configFlags, maskedLayers=[0, 1, 2], name="CKF_Back_woIFT",
+ actsOutputTag=f"{filestem}_3station_backward",
+ OutputCollection="CKFTrackCollectionBackwardWithoutIFT",
+ BackwardPropagation=True,
+ noDiagnostics=True))
#
# Configure output
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index bd5a972555eb2f640e1e70d6fc35bba836f4804d..c232f898cfc87689fc4de1144b3acf99dd957509 100755
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -43,9 +43,10 @@ if __name__ == "__main__":
configFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
- # configFlags.Output.RDOFileName = "my.RDO.pool.root"
+ configFlags.Output.RDOFileName = "my.RDO.pool.root"
configFlags.lock()
-# Configure components
+
+ # Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
# from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
index 08057518a5855b8e771b737462e955232198e918..54dfb668c7f9f69cfc667cf2945afa8fe87e39bb 100755
--- a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
@@ -42,7 +42,7 @@ if __name__ == "__main__":
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
- #configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
+ configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
configFlags.lock()
# Configure components
@@ -53,13 +53,13 @@ if __name__ == "__main__":
#acc.merge(PoolWriteCfg(configFlags))
# Configure output
- #from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- #itemList = [ "xAOD::EventInfo#*",
- # "xAOD::EventAuxInfo#*",
- # "xAOD::FaserTriggerData#*",
- # "xAOD::FaserTriggerDataAux#*" ]
- #acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
- #ostream = acc.getEventAlgo("OutputStreamRDO")
+ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ itemList = [ "xAOD::EventInfo#*",
+ "xAOD::EventAuxInfo#*",
+ "xAOD::FaserTriggerData#*",
+ "xAOD::FaserTriggerDataAux#*" ]
+ # This causes an error...
+ # acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
# Set up algorithm
acc.merge(TriggerDataAccessExampleCfg(configFlags))
diff --git a/Control/CalypsoExample/rawdata/FaserMC-MC24_PG_muon_fasernu_100GeV-100012-00000-HITS.root b/Control/CalypsoExample/rawdata/FaserMC-MC24_PG_muon_fasernu_100GeV-100012-00000-HITS.root
new file mode 100644
index 0000000000000000000000000000000000000000..45a79cb63f1c15a1c908858a2abfe47e316380c5
Binary files /dev/null and b/Control/CalypsoExample/rawdata/FaserMC-MC24_PG_muon_fasernu_100GeV-100012-00000-HITS.root differ
diff --git a/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py b/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
index 5ed331105cc6fa9a493c923d4c32ea64e2de5a9c..da54642d2f43834cdbe9c18898b6e0db1d4f8d08 100644
--- a/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
+++ b/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
@@ -63,9 +63,5 @@ def ScintWaveformDigitizationOutputCfg(flags, **kwargs):
ItemList = [
"RawWaveformContainer#*"
]
- acc.merge(OutputStreamCfg(flags, "RDO"))
- ostream = acc.getEventAlgo("OutputStreamRDO")
- # ostream.TakeItemsFromInput = True # Copies all data from input file to output
- # ostream.TakeItemsFromInput = False
- ostream.ItemList += ItemList
+ acc.merge(OutputStreamCfg(flags, "RDO", ItemList))
return acc
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py
index f952b5766a0acf1085974f3af9332a8ac3de0462..bebf4e593063701b33df3da0fadbb34eb07ef0cf 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py
@@ -5,6 +5,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaCommon.Logging import logging
+from AthenaConfiguration.Enums import BeamType
PileUpXingFolder=CompFactory.PileUpXingFolder
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -16,8 +17,8 @@ from FaserSCT_ConditionsTools.FaserSCT_SiliconConditionsConfig import FaserSCT_S
from FaserSCT_ConditionsTools.FaserSCT_ReadCalibChipDataConfig import FaserSCT_ReadCalibChipDataCfg
from FaserSiPropertiesTool.FaserSCT_SiPropertiesConfig import FaserSCT_SiPropertiesCfg
from FaserSiLorentzAngleTool.FaserSCT_LorentzAngleConfig import FaserSCT_LorentzAngleCfg
-from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
-from Digitization.PileUpToolsConfig import PileUpToolsCfg
+from DigitizationConfig.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
+from DigitizationConfig.PileUpToolsConfig import PileUpToolsCfg
# The earliest and last bunch crossing times for which interactions will be sent
@@ -40,7 +41,7 @@ def FaserSCT_DigitizationCommonCfg(flags, name="FaserSCT_DigitizationToolCommon"
kwargs.setdefault("EnableHits", True)
#kwargs.setdefault("BarrelOnly", False)
# Set FixedTime for cosmics for use in SurfaceChargesGenerator
- if flags.Beam.Type == "cosmics":
+ if flags.Beam.Type is BeamType.Cosmics:
kwargs.setdefault("CosmicsRun", True)
kwargs.setdefault("FixedTime", 10)
if flags.Digitization.DoXingByXingPileUp:
@@ -237,14 +238,14 @@ def FaserSCT_OutputCfg(flags):
"""Return ComponentAccumulator with Output for SCT. Not standalone."""
acc = ComponentAccumulator()
ItemList = ["FaserSCT_RDO_Container#*"]
- if flags.Digitization.TruthOutput:
+ if flags.Digitization.EnableTruth:
ItemList += ["TrackerSimDataCollection#*"]
ItemList += ["FaserSiHitCollection#*"] # Also write out the raw hits
acc.merge(TruthDigitizationOutputCfg(flags))
- acc.merge(OutputStreamCfg(flags, "RDO"))
- ostream = acc.getEventAlgo("OutputStreamRDO")
+ acc.merge(OutputStreamCfg(flags, "RDO", ItemList))
+ #ostream = acc.getEventAlgo("OutputStreamRDO")
#ostream.TakeItemsFromInput = True # Don't write hits to RDO by default
- ostream.ItemList += ItemList
+ #ostream.ItemList += ItemList
return acc
diff --git a/package_filters.txt b/package_filters.txt
index 6844b948776c541c4a9be589bad3a5e34c85f11a..341ee378810a20b3df6211f2b228969c1db16ccc 100644
--- a/package_filters.txt
+++ b/package_filters.txt
@@ -1,98 +1,21 @@
-#+Calorimeter/CaloDetDescr/CaloGeoModelUtils
-#+Calorimeter/CaloDetDescr/CaloIdDictFiles
-#+Calorimeter/CaloDetDescr/CaloReadoutGeometry
-#+Calorimeter/CaloDetDescr/FaserCaloIdentifier
-#+Calorimeter/CaloDetDescr/EcalGeoModel
-#+Calorimeter/CaloDetDescrCnv/CaloIdCnv
-#+Calorimeter/CaloDigiAlgs
-#+Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool
-#+Calorimeter/CaloEventCnv/FaserCaloSimEventTPCnv
-#+Calorimeter/CaloG4/EcalG4_SD
-#+Calorimeter/CaloRecAlgs
-#+Calorimeter/CaloRecTools
-#+Calorimeter/FaserCaloSimEvent
+Calorimeter/.*
-+Control/CalypsoConfiguration
-+Control/CalypsoExample/Generation
-+Control/CalypsoExample/GenEventExample
-+Control/CalypsoExample/GeoModelTest
-+Control/CalypsoExample/RDOReadExample
-+Control/CalypsoExample/Reconstruction
-+Control/CalypsoExample/SimHitExample
-+Control/CalypsoExample/Simulation
-+Control/CalypsoExample/TrackerDataAccessExample
-+Control/CalypsoExample/TriggerDataAccessExample
-+Control/CalypsoExample/WaveformAnalysisExample
-+Control/CalypsoExample/WaveformDataAccessExample
-+Control/CalypsoExample/WriteAlignment
--Control/.*
++Control/.*
+Database/ConnectionManagement/FaserAuthentication
-#+Derivation/DerivationAlgs
-#+Derivation/DerivationTools
+Derivation/.*
-+DetectorDescription/DetDescrCnvSvc
-+DetectorDescription/FaserDetDescr
-+DetectorDescription/FaserReadoutGeometry
-+DetectorDescription/GeoModel/FaserGeoAdaptors
-+DetectorDescription/GeoModel/FaserGeoModel
-+DetectorDescription/GeoModel/GeoModelFaserUtilities
-+DetectorDescription/GeoModel/GeoModelInterfaces
-+DetectorDescription/GeoModel/GeoModelSvc
-+DetectorDescription/IdDictDetDescrCnv
-#-DetectorDescription/.*
++DetectorDescription/.*
+Event/.*
+FaserGeometryCommon/.*
+Generators/.*
-+LHCData/LHCDataAlgs
-+LHCData/LHCDataTools
-#-LHCData/.*
++LHCData/.*
+MagneticField/MagFieldConditions
+MagneticField/MagFieldElements
+MagneticField/MagFieldServices
-MagneticField/.*
-Monitoring
-#+Neutrino/NeutrinoDetDescr/EmulsionGeoModel
-#+Neutrino/NeutrinoDetDescr/NeutrinoGeoModelUtils
-#+Neutrino/NeutrinoDetDescr/NeutrinoIdDictFiles
-#+Neutrino/NeutrinoDetDescr/NeutrinoIdentifier
-#+Neutrino/NeutrinoDetDescr/NeutrinoReadoutGeometry
-#+Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv
-#+Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool
-#+Neutrino/NeutrinoEventCnv/NeutrinoSimEventTPCnv
-#+Neutrino/NeutrinoRecAlgs
-#+Neutrino/NeutrinoSimEvent
+Neutrino/.*
+PhysicsAnalysis/NtupleDumper
-PhysicsAnalysis/.*
-#+Scintillator/ScintDetDescr/PreshowerGeoModel
-#+Scintillator/ScintDetDescr/ScintGeoModelUtils
-#+Scintillator/ScintDetDescr/ScintIdDictFiles
-#+Scintillator/ScintDetDescr/ScintIdentifier
-#+Scintillator/ScintDetDescr/ScintReadoutGeometry
-#+Scintillator/ScintDetDescr/TriggerGeoModel
-#+Scintillator/ScintDetDescr/VetoGeoModel
-#+Scintillator/ScintDetDescr/VetoNuGeoModel
-#+Scintillator/ScintDetDescrCnv/ScintIdCnv
-#+Scintillator/ScintDigiAlgs
-#+Scintillator/ScintEventCnv/ScintSimEventAthenaPool
-#+Scintillator/ScintEventCnv/ScintSimEventTPCnv
-#+Scintillator/ScintSimEvent
+Scintillator/.*
-#+Simulation/G4Extensions/Pythia8Decayer
-#+Simulation/G4Faser/G4FaserAlg
-#+Simulation/G4Faser/G4FaserServices
-#+Simulation/G4Faser/G4FaserTools
-#+Simulation/G4Sim/FaserMCTruth
-#+Simulation/G4Sim/FaserMCTruthBase
-#+Simulation/G4Utilities/FaserGeo2G4
-#+Simulation/G4Utilities/FaserGeoMaterial2G4
-#+Simulation/G4Utilities/FaserG4UserActions
-#+Simulation/ISF/ISF_Core/FaserISF_Event
-#+Simulation/ISF/ISF_Core/FaserISF_Interfaces
-#+Simulation/ISF/ISF_Core/FaserISF_Services
-#+Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event
-#+Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Interfaces
-#+Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools
+Simulation/.*
+Tracker/TrackerAlignTools/TrackerAlignGenTools
+Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms
@@ -149,38 +72,7 @@
-Tracking/.*
+Trigger/FaserTrigEventCnv/FaserTriggerByteStream
#-Trigger/.*
-#+Waveform/WaveDigiTools
-#+Waveform/WaveEventCnv/WaveByteStream
-#+Waveform/WaveEventCnv
-#+Waveform/WaveformConditions
-#+Waveform/WaveRawEvent
-#+Waveform/WaveRecAlgs
-#+Waveform/WaveRecTools
+Waveform/.*
-+faser-common/EventFormats
-+faser-common/Exceptions
-+faser-common/Logging
-#-faser-common/.*
-#+graphics/VTI12/VTI12Algs
-#+graphics/VTI12/VTI12Gui
-#+graphics/VTI12/VTI12Plugins/VTI12FaserPlugin
-#+graphics/VTI12/VTI12Plugins/VTI12GeometryPlugin
-#+graphics/VTI12/VTI12Plugins/VTI12WaveformPlugin
-#+graphics/VTI12/VTI12Systems/VTI12GeometrySystems
-#+graphics/VTI12/VTI12Systems/VTI12GuideLineSystems
-#+graphics/VTI12/VTI12Systems/VTI12PRDSystems
-#+graphics/VTI12/VTI12Systems/VTI12RawDataSystems
-#+graphics/VTI12/VTI12Systems/VTI12SimHitSystems
-#+graphics/VTI12/VTI12Systems/VTI12TrackSystems
-#+graphics/VTI12/VTI12Systems/VTI12WaveformSystems
-#+graphics/VTI12/VTI12Utils
++faser-common/.*
+graphics/.*
-#+xAOD/xAODFaserCalorimeter
-#+xAOD/xAODFaserCalorimeterAthenaPool
-#+xAOD/xAODFaserLHC
-#+xAOD/xAODFaserLHCAthenaPool
-#+xAOD/xAODFaserTrigger
-#+xAOD/xAODFaserTriggerAthenaPool
-#+xAOD/xAODFaserWaveform
-#+xAOD/xAODFaserWaveformAthenaPool
+xAOD/.*