diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h
index 395ef4b984541a6fbc70967a992739443cd0c032..ffad36c45c073f76beab88ea293ef0731a71034f 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h
@@ -67,7 +67,11 @@ class CaloGeometry : virtual public ICaloGeometry {
TGraph* DrawGeoSampleForPhi0(int sample, int calocol, bool print=false);
TCanvas* DrawGeoForPhi0();
FCAL_ChannelMap* GetFCAL_ChannelMap(){return &m_FCal_ChannelMap;}
- virtual void LoadFCalGeometryFromFiles(TString filename1,TString filename2,TString filename3); // Initialize m_FCal_ChannelMap
+ void SetFCal_ChannelMap(const FCAL_ChannelMap* fcal_ChannnelMap){m_FCal_ChannelMap=*fcal_ChannnelMap;}
+
+ virtual bool LoadFCalGeometryFromFiles(TString filename1,TString filename2,TString filename3); // Initialize m_FCal_ChannelMap
+ void calculateFCalRminRmax();
+ virtual bool checkFCalGeometryConsistency();
virtual void PrintMapInfo(int i, int j);
protected:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometryFromCaloDDM.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometryFromCaloDDM.h
index 169eff26fae2594f727b00aeb2059031d4684c6b..5f32b27db833e82b8d92343e059774b22bc83dc5 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometryFromCaloDDM.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometryFromCaloDDM.h
@@ -6,6 +6,7 @@
#define CaloGeometryFromCaloDDM_h
#include "ISF_FastCaloSimParametrization/CaloGeometry.h"
+#include "LArReadoutGeometry/FCALDetectorManager.h"
class CaloDetDescrManager;
@@ -15,6 +16,7 @@ public :
virtual ~CaloGeometryFromCaloDDM();
virtual bool LoadGeometryFromCaloDDM(const CaloDetDescrManager* calo_dd_man);
+ virtual bool LoadFCalChannelMapFromFCalDDM(const FCALDetectorManager* fcal_dd_man);
};
#endif
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
index 0c2c808baf6ce7bea2bb2aaf4abc1a02031887d0..09231e67a9c62016628db7c6f2fa8b0ee0ea7f93 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
@@ -899,7 +899,7 @@ std::string CaloGeometry::SamplingName(int sample)
return CaloSampling::getSamplingName(sample);
}
-void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2,TString filename3){
+bool CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2,TString filename3){
vector<ifstream*> electrodes(3);
@@ -969,6 +969,30 @@ void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2
for(int imodule=1;imodule<=3;imodule++) delete electrodes[imodule-1];
electrodes.clear();
+ this->calculateFCalRminRmax();
+ return this->checkFCalGeometryConsistency();
+
+}
+
+void CaloGeometry::calculateFCalRminRmax(){
+
+ m_FCal_rmin.resize(3,FLT_MAX);
+ m_FCal_rmax.resize(3,0.);
+
+ double x(0.),y(0.),r(0.);
+ for(int imap=1;imap<=3;imap++)for(auto it=m_FCal_ChannelMap.begin(imap);it!=m_FCal_ChannelMap.end(imap);it++){
+ x=it->second.x();
+ y=it->second.y();
+ r=sqrt(x*x+y*y);
+ if(r<m_FCal_rmin[imap-1])m_FCal_rmin[imap-1]=r;
+ if(r>m_FCal_rmax[imap-1])m_FCal_rmax[imap-1]=r;
+ }
+
+}
+
+
+bool CaloGeometry::checkFCalGeometryConsistency(){
+
unsigned long long phi_index,eta_index;
float x,y,dx,dy;
long id;
@@ -988,6 +1012,7 @@ void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2
cout << "Error: Incompatibility between FCalChannel map and GEO file: Different number of cells in m_cells_in_sampling and FCal_ChannelMap" << endl;
cout << "m_cells_in_sampling: " << m_cells_in_sampling[sampling].size() << endl;
cout << "FCal_ChannelMap: " << 2*std::distance(m_FCal_ChannelMap.begin(imap), m_FCal_ChannelMap.end(imap)) << endl;
+ return false;
}
for(auto it=m_FCal_ChannelMap.begin(imap);it!=m_FCal_ChannelMap.end(imap);it++){
@@ -999,19 +1024,11 @@ void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2
y=it->second.y();
m_FCal_ChannelMap.tileSize(imap, eta_index, phi_index,dx,dy);
-
- double r=sqrt(x*x+y*y);
-
- if(r<m_FCal_rmin[imap-1])m_FCal_rmin[imap-1]=r;
- if(r>m_FCal_rmax[imap-1])m_FCal_rmax[imap-1]=r;
-
id=(mask1[imap-1]<<12) + (eta_index << 5) +2*phi_index;
if(imap==2) id+= (8<<8);
- //cout << phi_index << " " << eta_index << " " << (id<<44) << " " << hex << (id<<44) << dec << endl ;
-
- Identifier id1((unsigned long long)(id<<44));
+ Identifier id1((unsigned long long)(id<<44));
const CaloDetDescrElement *DDE1 =getDDE(id1);
id=(mask2[imap-1]<<12) + (eta_index << 5) +2*phi_index;
@@ -1019,21 +1036,17 @@ void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2
Identifier id2((unsigned long long)(id<<44));
const CaloDetDescrElement *DDE2=getDDE(id2);
- if(!TMath::AreEqualRel(x, DDE1->x(),1.E-8) || !TMath::AreEqualRel(y, DDE1->y(),1.E-8) ||
- !TMath::AreEqualRel(x, DDE2->x(),1.E-8) || !TMath::AreEqualRel(y, DDE2->y(),1.E-8)
- ){
- cout << "Error: Incompatibility between FCalChannel map and GEO file \n"
- << x << " " << DDE1->x() << " " << DDE2->x()
- << y << " " << DDE1->y() << " " << DDE2->y() << endl;
-
+ if(!TMath::AreEqualRel(x, DDE1->x(),1.E-8) || !TMath::AreEqualRel(y, DDE1->y(),1.E-8) || !TMath::AreEqualRel(x, DDE2->x(),1.E-8) || !TMath::AreEqualRel(y, DDE2->y(),1.E-8) ){
+ cout << "Error: Incompatibility between FCalChannel map and GEO file \n" << x << " " << DDE1->x() << " " << DDE2->x() << y << " " << DDE1->y() << " " << DDE2->y() << endl;
+ return false;
}
}
}
-
-
+
+ return true;
}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryFromCaloDDM.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryFromCaloDDM.cxx
index ffc2ad9fae244e27a045e2af46feab80bdddaa6b..c4ed07b90a7d3c973f174bbbd90dd54885e4af9c 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryFromCaloDDM.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryFromCaloDDM.cxx
@@ -32,4 +32,8 @@ bool CaloGeometryFromCaloDDM::LoadGeometryFromCaloDDM(const CaloDetDescrManager*
return PostProcessGeometry();
}
-
+bool CaloGeometryFromCaloDDM::LoadFCalChannelMapFromFCalDDM(const FCALDetectorManager* fcal_dd_man){
+ this->SetFCal_ChannelMap( fcal_dd_man->getChannelMap() );
+ this->calculateFCalRminRmax();
+ return this->checkFCalGeometryConsistency();
+}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx
index 238119faff1b9be7461e7c5cff1a79d385756ec2..f8663edb9a4815f91c82804d846aa920a82afbd6 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx
@@ -31,6 +31,7 @@
#include "CaloEvent/CaloCellContainer.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
+#include "LArReadoutGeometry/FCALDetectorManager.h"
#include "PathResolver/PathResolver.h"
@@ -77,10 +78,12 @@ StatusCode ISF::FastCaloSimSvcV2::initialize()
}
const CaloDetDescrManager* calo_dd_man = CaloDetDescrManager::instance();
+ const FCALDetectorManager * fcalManager=NULL;
+ detStore()->retrieve(fcalManager);
+
m_caloGeo = new CaloGeometryFromCaloDDM();
m_caloGeo->LoadGeometryFromCaloDDM(calo_dd_man);
- TString path_to_fcal_geo_files = "/afs/cern.ch/atlas/groups/Simulation/FastCaloSimV2/";
- m_caloGeo->LoadFCalGeometryFromFiles(path_to_fcal_geo_files + "FCal1-electrodes.sorted.HV.09Nov2007.dat", path_to_fcal_geo_files + "FCal2-electrodes.sorted.HV.April2011.dat", path_to_fcal_geo_files + "FCal3-electrodes.sorted.HV.09Nov2007.dat");
+ if(!m_caloGeo->LoadFCalChannelMapFromFCalDDM(fcalManager) )ATH_MSG_FATAL("Found inconsistency between FCal_Channel map and GEO file. Please, check if they are configured properly.");
const std::string fileName = m_paramsFilename;
std::string inputFile=PathResolverFindCalibFile(fileName);
@@ -209,6 +212,7 @@ StatusCode ISF::FastCaloSimSvcV2::simulate(const ISF::ISFParticle& isfp)
m_FastCaloSimCaloExtrapolation->extrapolate(extrapol,&truth);
TFCSSimulationState simulstate(m_randomEngine);
+ ATH_MSG_DEBUG(" particle: " << isfp.pdgCode() << " Ekin: " << isfp.ekin() << " eta: " << particle_position.eta());
FCSReturnCode status = m_param->simulate(simulstate, &truth, &extrapol);
if (status != FCSSuccess) {
return StatusCode::FAILURE;