Skip to content
Snippets Groups Projects
Commit 4b295d94 authored by Petr Jacka's avatar Petr Jacka
Browse files

Cleaned mess in CaloGeometry classes 

Former-commit-id: 0f1a5ee8
parent 4f5d3dd3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 27 deletions
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/ISF_HitAnalysis.h
+ 17
− 0
View file @ 4b295d94
......@@ -160,6 +160,23 @@ class ISF_HitAnalysis : public AthAlgorithm {
double m_ptruth_p;
int m_pdgid;
/*
std::vector<std::vector<float> >* m_TTC_entrance_eta;
std::vector<std::vector<float> >* m_TTC_entrance_phi;
std::vector<std::vector<float> >* m_TTC_entrance_r;
std::vector<std::vector<float> >* m_TTC_entrance_z;
std::vector<std::vector<float> >* m_TTC_back_eta;
std::vector<std::vector<float> >* m_TTC_back_phi;
std::vector<std::vector<float> >* m_TTC_back_r;
std::vector<std::vector<float> >* m_TTC_back_z;
std::vector<float>* m_TTC_IDCaloBoundary_eta;
std::vector<float>* m_TTC_IDCaloBoundary_phi;
std::vector<float>* m_TTC_IDCaloBoundary_r;
std::vector<float>* m_TTC_IDCaloBoundary_z;
std::vector<float>* m_TTC_Angle3D;
std::vector<float>* m_TTC_AngleEta;
*/
std::vector<std::vector<float> >* m_newTTC_entrance_eta;
std::vector<std::vector<float> >* m_newTTC_entrance_phi;
std::vector<std::vector<float> >* m_newTTC_entrance_r;
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_FastCaloSimParametrizationConfig.py
+ 0
− 1
View file @ 4b295d94
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
"""
Tools configurations for ISF_FastCaloSimParametrization
"""
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
+ 1
− 1
View file @ 4b295d94
streamRDO.ItemList+=["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps","LArHitContainer#*","TileHitVector#*"];
streamRDO.ItemList+=["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps","LArHitContainer#*","TileHitVector#*"];
from AthenaCommon.CfgGetter import getPublicTool
getPublicTool("LArPileUpTool").CrossTalk=False
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiTilePostInclude.py
+ 9
− 9
View file @ 4b295d94
from AthenaCommon.AppMgr import ServiceMgr
ToolSvc.TileHitVecToCntTool.HitTimeFlag=1
ServiceMgr.MessageSvc.OutputLevel= VERBOSE
#rel 19 is configuring this via a tool!!
ToolSvc.TileHitVecToCntTool.HitTimeFlag=1
ServiceMgr.TileInfoLoader.NPhElec=0
ServiceMgr.TileInfoLoader.NPhElecA=0
......@@ -8,14 +9,13 @@ ServiceMgr.TileInfoLoader.NPhElecC=0
ServiceMgr.TileInfoLoader.NPhElecD=0
ServiceMgr.TileInfoLoader.NPhElecE=0
topSequence.TileDigitsMaker.IntegerDigits=True
###########
print ServiceMgr.TileInfoLoader
print topSequence.TileDigitsMaker
print ToolSvc.TileHitVecToCntTool
#topSequence.TileDigitsMaker.OutputLevel=1
#TileHitVecToCntTool.OutputLevel=1
#ToolSvc.TileRawChannelBuilderOptATLAS.OutputLevel=1
#ServiceMgr.MessageSvc.OutputLevel= VERBOSE
###########
topSequence.TileDigitsMaker.OutputLevel=1
topSequence.TileDigitsMaker.IntegerDigits=True
TileHitVecToCntTool.OutputLevel=1
ToolSvc.TileRawChannelBuilderOptATLAS.OutputLevel=1
###########
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
+ 0
− 1
View file @ 4b295d94
......@@ -21,4 +21,3 @@ stepInfoSDTool.maxrEM2=60
stepInfoSDTool.maxEtaEM3=1
stepInfoSDTool.maxPhiEM3=5
stepInfoSDTool.maxrEM3=8
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
+ 1
− 0
View file @ 4b295d94
......@@ -14,6 +14,7 @@
#include <fstream>
#include <sstream>
#include "CaloDetDescr/CaloDetDescrElement.h"
//#include "ISF_FastCaloSimParametrization/CaloDetDescrElement.h"
#include "CaloGeoHelpers/CaloSampling.h"
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
+ 2
− 2
View file @ 4b295d94
......@@ -193,7 +193,7 @@ StatusCode FastCaloSimParamAlg::execute()
}
//clusterize(eventSteps);
std::cout << "Size after clusterization: " << MergeeventSteps->size() << std::endl;
StatusCode sc = evtStore()->record(MergeeventSteps,"MergedEventSteps");
StatusCode sc = evtStore()->record(MergeeventSteps,"ZHMergedEventSteps");
if (sc.isFailure())
{
std::cout<<"Coudn't resave merged collection "<<std::endl;
......@@ -219,7 +219,7 @@ const HepMC::GenParticle* FastCaloSimParamAlg::getParticleFromMC()
const ISF_FCS_Parametrization::FCS_StepInfoCollection* FastCaloSimParamAlg::getFCS_StepInfo()
{
const ISF_FCS_Parametrization::FCS_StepInfoCollection* eventStepsES;
StatusCode sc = evtStore()->retrieve(eventStepsES, "EventSteps");
StatusCode sc = evtStore()->retrieve(eventStepsES, "ZHEventSteps");
if (sc.isFailure()) return NULL;
return eventStepsES;
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
+ 1
− 1
View file @ 4b295d94
......@@ -779,7 +779,7 @@ StatusCode ISF_HitAnalysis::execute()
//Get the FastCaloSim step info collection from store
const ISF_FCS_Parametrization::FCS_StepInfoCollection* eventStepsES;
StatusCode sc = evtStore()->retrieve(eventStepsES, "MergedEventSteps");
StatusCode sc = evtStore()->retrieve(eventStepsES, "ZHMergedEventSteps");
if (sc.isFailure())
{
ATH_MSG_WARNING( "No FastCaloSim steps read from StoreGate?" );
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/CaloGeometryFromFile.cxx
+ 5
− 2
View file @ 4b295d94
......@@ -5,7 +5,7 @@
#include "CaloGeometryFromFile.h"
#include <TTree.h>
#include <TFile.h>
#include "CaloDetDescr/CaloDetDescrElement.h"
#include "ISF_FastCaloSimParametrization/CaloGeoDetDescrElement.h"
#include <fstream>
#include <sstream>
#include <TGraph.h>
......@@ -106,6 +106,7 @@ bool CaloGeometryFromFile::LoadGeometryFromFile(TString filename,TString treenam
if (g_cellId_vs_cellHashId_map.find(cell.m_identify)!=g_cellId_vs_cellHashId_map.end()) cell.m_hash_id=g_cellId_vs_cellHashId_map[cell.m_identify];
else cout << endl << "ERROR: Cell id not found in the cellId_vs_cellHashId_map!!!" << endl << endl;
const CaloDetDescrElement* pcell=new CaloDetDescrElement(cell);
int sampling = pcell->getSampling();
......@@ -146,6 +147,7 @@ bool CaloGeometryFromFile::LoadGeometryFromFile(TString filename,TString treenam
bool ok = PostProcessGeometry();
cout << "Result of PostProcessGeometry(): " << ok << endl;
const CaloDetDescrElement* mcell=0;
unsigned long long cellid64(3179554531063103488);
Identifier cellid(cellid64);
......@@ -326,7 +328,7 @@ void CaloGeometryFromFile::LoadFCalGeometryFromFiles(TString filename1,TString f
for(int imodule=1;imodule<=3;imodule++) delete electrodes[imodule-1];
electrodes.clear();
}
void CaloGeometryFromFile::DrawFCalGraph(int isam,int color){
......@@ -339,6 +341,7 @@ void CaloGeometryFromFile::DrawFCalGraph(int isam,int color){
double x[size];
double y[size];
//const CaloDetDescrElement* cell;
int i=0;
for(auto it=m_cells_in_sampling[isam].begin();it!=m_cells_in_sampling[isam].end();it++){
x[i]=it->second->x();
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/init_geo.C
+ 0
− 1
View file @ 4b295d94
......@@ -37,4 +37,3 @@ void init_geo()
}
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+ 2
− 5
View file @ 4b295d94
......@@ -9,8 +9,6 @@ atlas_subdir( ISF_FastCaloSimServices )
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaKernel
DetectorDescription/IdDictParser
Control/AthenaBaseComps
Simulation/Barcode/BarcodeEvent
Simulation/ISF/ISF_Core/ISF_Interfaces
......@@ -25,8 +23,7 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/FastShower/FastCaloSim
Simulation/ISF/ISF_Core/ISF_Event
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization )
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces )
# External dependencies:
......@@ -38,7 +35,7 @@ atlas_add_component( ISF_FastCaloSimServices
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel IdDictParser ISF_Interfaces TrkEventPrimitives TrkExInterfaces CaloEvent StoreGateLib SGtests NavFourMom GeneratorObjects FastCaloSimLib ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces ISF_FastCaloSimParametrizationLib )
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel ISF_Interfaces TrkEventPrimitives TrkExInterfaces CaloEvent StoreGateLib SGtests NavFourMom GeneratorObjects FastCaloSimLib ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces )
# Install files from the package:
atlas_install_headers( ISF_FastCaloSimServices )
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
+ 1
− 3
View file @ 4b295d94
......@@ -13,11 +13,9 @@ from AthenaCommon.Constants import * # FATAL,ERROR etc.
from AthenaCommon.SystemOfUnits import *
from AthenaCommon.DetFlags import DetFlags
from ISF_Config.ISF_jobProperties import ISF_Flags # IMPORTANT: Flags must be set before tools are retrieved
from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags
from ISF_Algorithms.collection_merger_helpers import generate_mergeable_collection_name
def getAdditionalParticleParametrizationFileNames():
return [
"DB=/GLOBAL/AtlfastII/FastCaloSimParam:2:EnergyResults/pdgid_211/EN_1000/eta_central",
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx
+ 1
− 0
View file @ 4b295d94
......@@ -464,6 +464,7 @@ StatusCode ISF::FastCaloSimSvcV2::simulate(const ISF::ISFParticle& isfp)
//std::cout << "Bin: " << i << " mean: " << mean << " err: " << err << std::endl;
energyDensityInBin = CLHEP::RandGauss::shoot(m_randomEngine,mean,err);
energyInBin = energyDensityInBin * layerE;
double minR = proj->GetBinLowEdge(i);
......
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.h
+ 1
− 1
View file @ 4b295d94
......@@ -22,6 +22,7 @@
#include "ISF_FastCaloSimEvent/IntArray.h"
#include "TH2D.h"
#include "TRandom3.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
......@@ -133,7 +134,6 @@ namespace ISF {
std::vector<double> m_rlayer;
/** enable/disable random fluctuations in calorimeter layers */
bool m_doRandomFluctuations;
bool m_useFastCaloSimCaloExtrapolation;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment