Skip to content
Snippets Groups Projects
Commit c0d8a19c authored by Soshi Tsuno's avatar Soshi Tsuno
Browse files

update

parent e8973122
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!39056Remove Lorentz angle correction (ATLASRECTS-5827)
......@@ -145,7 +145,8 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
int barrel_ec = pixelId->barrel_ec(element->identify());
int layerIndex = pixelId->layer_disk(element->identify());
double LACorr = moduleData->getLorentzAngleCorr(barrel_ec,layerIndex);
//STSTST double LACorr = moduleData->getLorentzAngleCorr(barrel_ec,layerIndex);
double LACorr = 1.0;
if (not p_design){
ATH_MSG_FATAL("Dynamic cast to PixelModuleDesign* failed in PixelSiLorentzAngleCondAlg::execute");
......
......@@ -210,6 +210,8 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
const EBC_EVCOLL evColl = EBC_MAINEVCOLL;
const HepMcParticleLink::PositionFlag idxFlag = (phit.eventId()==0) ? HepMcParticleLink::IS_POSITION: HepMcParticleLink::IS_INDEX;
std::cout << "STSTST SensorSimPlanarTool OK1 " << std::endl;
//**************************************//
//*** Now diffuse charges to surface *** //
//**************************************//
......@@ -249,6 +251,8 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
int numBins_weightingPotential_y = 0;
int numBins_weightingPotential_z = 0;
std::cout << "STSTST SensorSimPlanarTool OK2 " << m_doRadDamage << " " << !(Module.isDBM()) << " " << Module.isBarrel() << std::endl;
if (m_doRadDamage && !(Module.isDBM()) && Module.isBarrel()) {
centreOfPixel_i = p_design.positionFromColumnRow(pixel_i.etaIndex(), pixel_i.phiIndex());
......@@ -263,6 +267,8 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
nnLoop_pixelPhiMax = std::min( 2,pixel_i.phiIndex() );
nnLoop_pixelPhiMin = std::max( -2, pixel_i.phiIndex() + 1 - phiCells );
std::cout << "STSTST SensorSimPlanarTool OK3 " << std::endl;
//Setup values to check for overflow when using maps
if (m_doInterpolateEfield) {
numBins_driftTime_e = m_distanceMap_e[layer]->GetNbinsY(); //Returns nBins = totalBins - underflow - overflow
......@@ -272,14 +278,18 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
numBins_weightingPotential_z = m_ramoPotentialMap[layer]->GetNbinsZ();
}
else { // use fluence value from conditions data
std::cout << "STSTST SensorSimPlanarTool OK4 " << layer << std::endl;
numBins_driftTime_e = moduleData->getDistanceMap_e(layer)->GetNbinsY();
numBins_driftTime_h = moduleData->getDistanceMap_h(layer)->GetNbinsY();
numBins_weightingPotential_x = moduleData->getRamoPotentialMap(layer)->GetNbinsX();
numBins_weightingPotential_y = moduleData->getRamoPotentialMap(layer)->GetNbinsY();
numBins_weightingPotential_z = moduleData->getRamoPotentialMap(layer)->GetNbinsZ();
std::cout << "STSTST SensorSimPlanarTool OK5 " << std::endl;
}
}
std::cout << "STSTST SensorSimPlanarTool OK6 " << std::endl;
// Distance between charge and readout side. p_design->readoutSide() is
// +1 if readout side is in +ve depth axis direction and visa-versa.
double dist_electrode = 0.5 * sensorThickness - Module.design().readoutSide() * depth_i;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment