restore deleted InDet files; increased timeout onm fullmenu

InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt

+################################################################################
+# Package: InDetCondTools
+################################################################################
+
+# Declare the package name:
+atlas_subdir( InDetCondTools )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaKernel
+                          DetectorDescription/GeoPrimitives
+                          GaudiKernel )
+
+# External dependencies:
+find_package( Eigen )
+
+# Component(s) in the package:
+atlas_add_library( InDetCondTools
+                   PUBLIC_HEADERS InDetCondTools
+                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives GaudiKernel )
+

InnerDetector/InDetConditions/InDetCondTools/InDetCondTools/ISiLorentzAngleTool.h

+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file ISiLorentzAngleTool.h
+ * @author Susumu.Oda@cern.ch
+**/
+#ifndef ISiLorentzAngleTool_h
+#define ISiLorentzAngleTool_h
+
+//Gaudi Includes
+#include "GaudiKernel/IAlgTool.h"
+// Amg
+#include "GeoPrimitives/GeoPrimitives.h"
+
+//forward declarations
+class IdentifierHash;
+
+/**
+ * @class ISiLorentzAngleTool
+ * Interface class for tool providing Lorentz angle (and the corresponding shift of the measurement) 
+ * for each detector element.
+**/
+class ISiLorentzAngleTool: virtual public IAlgTool
+{
+public:
+  virtual ~ISiLorentzAngleTool() = default;
+
+  /// Creates the InterfaceID and interfaceID() method
+  DeclareInterfaceID(ISiLorentzAngleTool, 1, 0);
+
+  /** Get the Lorentz angle shift in the local x (phiDist) direction
+      Assumes the center of the detector and is generally cached. */
+  virtual double getLorentzShift(const IdentifierHash& elementHash) const = 0;
+
+  /** As above, but provide the local position. 
+      More accurate but slower */
+  virtual double getLorentzShift(const IdentifierHash& elementHash, const Amg::Vector2D& locPos) const = 0;
+
+  /** Get the Lorentz angle shift in the local y (etaDist) direction
+      Assumes the center of the detector and is generally cached.*/
+  virtual double getLorentzShiftEta(const IdentifierHash& elementHash) const = 0;
+
+  /** As above, but provide the local position. 
+      More accurate but slower. */
+  virtual double getLorentzShiftEta(const IdentifierHash& elementHash, const Amg::Vector2D& locPos) const = 0;
+
+  /** Get tan af the Lorentz angle in the local x (phiDist) direction
+      Assumes the center of the detector and is generally cached. */
+  virtual double getTanLorentzAngle(const IdentifierHash& elementHash) const = 0;
+
+  /** As above, but provide the local position. 
+      More accurate but slower. */
+  virtual double getTanLorentzAngle(const IdentifierHash& elementHash, const Amg::Vector2D& locPos) const = 0;
+
+  /** Get tan af the Lorentz angle in the local y (etaDist) direction
+      Assumes the center of the detector and is generally cached */
+  virtual double getTanLorentzAngleEta(const IdentifierHash& elementHash) const = 0;
+
+  /** As above, but provide the local position. 
+      More accurate but slower. */
+  virtual double getTanLorentzAngleEta(const IdentifierHash& elementHash, const Amg::Vector2D& locPos) const = 0;
+
+  /** Get bias voltage */
+  virtual double getBiasVoltage(const IdentifierHash& elementHash) const = 0;
+
+  /** Get temperature */
+  virtual double getTemperature(const IdentifierHash& elementHash) const = 0;
+
+  /** Get depletion voltage */
+  virtual double getDepletionVoltage(const IdentifierHash& elementHash) const = 0;
+};
+
+#endif // ISiLorentzAngleTool_h

InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py

+#!/usr/bin/env python
+"""Run tests on BCM_DigitizationConfigNew.py
+
+Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+"""
+import os
+from AthenaCommon.Logging import log
+from AthenaCommon.Constants import DEBUG
+from AthenaCommon.Configurable import Configurable
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+from BCM_Digitization.BCM_DigitizationConfigFlags import createBCMCfgFlags
+from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
+from TrigUpgradeTest.InDetConfig import InDetGMConfig # FIXME This module would ideally be located somewhere else
+# Set up logging and new style config
+log.setLevel(DEBUG)
+Configurable.configurableRun3Behavior = True
+# Provide input
+dataDir = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art"
+inputDir = os.environ.get("ATLAS_REFERENCE_DATA", dataDir)
+fileDir = "/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
+ConfigFlags.Input.Files = [inputDir + fileDir]
+# Specify output
+ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
+ConfigFlags.lock()
+# Construct ComponentAccumulator
+cfg = MainServicesSerialCfg()
+cfg.merge(PoolReadCfg(ConfigFlags))
+cfg.merge(InDetGMConfig(ConfigFlags)) # FIXME This sets up the whole ID geometry would be nicer just to set up min required for BCM
+# Use BCM tools
+BCMflags = createBCMCfgFlags()
+acc = BCM_DigitizationCfg(BCMflags)
+cfg.merge(acc)
+# Add configuration to write HITS pool file
+outConfig = OutputStreamCfg(ConfigFlags, "RDO",
+    ItemList=["InDetSimDataCollection#*", "BCM_RDO_Container#*"])
+cfg.merge(outConfig)
+cfg.getService("StoreGateSvc").Dump=True
+cfg.printConfig(withDetails=True)
+ConfigFlags.dump()
+# Execute and finish
+cfg.run(maxEvents=3)
+

Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt

@@ -140,7 +140,7 @@ file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu )
 atlas_add_test( fullMenu
    SCRIPT test/test_full_menu.sh
    EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES TIMEOUT 1000
+   PROPERTIES TIMEOUT 2000
    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu
    )