Merge branch 'noisetool.CaloTBRec-20210325' into 'master'

CaloTBRec: Remove references to CaloNoiseTool.

See merge request atlas/athena!41998

Calorimeter/CaloTestBeam/CaloTBRec/share/CaloTBRec_H8_Cell_jobOptions.py

@@ -12,15 +12,10 @@
 #CaloCellGetter()
 include ("CaloRec/CaloRec_jobOptions.py")
 
-#Apply identical settings for caonoisetool (do not know, who is using it) and CaloNoiseToolDefault
-include ( "CaloTools/CaloNoiseTool_TB_jobOptions.py" )
 if not doSim:
-    ToolSvc.calonoisetool.UseSymmetry=FALSE
     ToolSvc.LArAutoCorrTotalTool.NMinBias=0 
-    ToolSvc.calonoisetool.WithOF=FALSE
 
 if doLArOFC:
-    ToolSvc.calonoisetool.WithOF=TRUE
     if not doSim:
         ToolSvc.LArOFCTool.FromDatabase=TRUE
 

Calorimeter/CaloTestBeam/CaloTBRec/share/CaloTBRec_H8_ClusterOnly_jobOptions.py

@@ -18,7 +18,6 @@ CaloTopoClusterEMMaker.TopoCluster.CalorimeterNames=[
 CaloTopoClusterEMMaker.TopoCluster.SeedSamplingNames = [
 	  "PreSamplerB", "EMB1", "EMB2", "EMB3",
 	  "PreSamplerE", "EME1", "EME2", "EME3"]
-CaloTopoClusterEMMaker.TopoCluster.UseCaloNoiseTool=FALSE
 CaloTopoClusterEMMaker.TopoCluster.UsePileUpNoise=FALSE
 CaloTopoClusterEMMaker.TopoCluster.NeighborOption                 = "all3D"
 CaloTopoClusterEMMaker.TopoCluster.NoiseSigma                     = 200.0*MeV

Calorimeter/CaloTestBeam/CaloTBRec/share/CaloTBRec_H8_Cluster_jobOptions.py

@@ -32,12 +32,9 @@ if doCaloTopoCluster:
      "ENG_FRAC_CORE" ,
      "SECOND_ENG_DENS" ,
   ]
-  #Apply identical settings for calonoisetool (do not know, who is using it) and CaloNoiseToolDefault 
+
   if not doSim:
-     ToolSvc.CaloNoiseToolDefault.UseSymmetry=FALSE
      ToolSvc.LArAutoCorrTotalToolDefault.NMinBias=0
-     ToolSvc.CaloNoiseToolDefault.WithOF=FALSE
   if doLArOFC:
-     ToolSvc.CaloNoiseToolDefault.WithOF=TRUE
      if not doSim:
          ToolSvc.LArOFCToolDefault.FromDatabase=TRUE