From c67183bbfd06f67f4cac53a104592345b24c43d5 Mon Sep 17 00:00:00 2001 From: odjuvsla Date: Fri, 19 Mar 2010 16:45:37 +0000 Subject: [PATCH] - fixed wrong constant - cosmetics --- HLT/PHOS/AliHLTPHOSConstants.cxx | 2 +- HLT/PHOS/AliHLTPHOSGeometry.cxx | 7 +++---- HLT/PHOS/AliHLTPHOSMapper.cxx | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/HLT/PHOS/AliHLTPHOSConstants.cxx b/HLT/PHOS/AliHLTPHOSConstants.cxx index 0fd010c4504..901666c5afd 100644 --- a/HLT/PHOS/AliHLTPHOSConstants.cxx +++ b/HLT/PHOS/AliHLTPHOSConstants.cxx @@ -69,7 +69,7 @@ AliHLTPHOSConstants::AliHLTPHOSConstants() : fkNALTROS(4), fkNALTROCHANNELS(16), fkNBRANCHES(2), - fkCELLSTEP(2.2), + fkCELLSTEP(2.255), fkNRCUSPERSECTOR(-9999), fkDDLOFFSET(1792) { diff --git a/HLT/PHOS/AliHLTPHOSGeometry.cxx b/HLT/PHOS/AliHLTPHOSGeometry.cxx index ed92544a24c..ac909ee42ad 100644 --- a/HLT/PHOS/AliHLTPHOSGeometry.cxx +++ b/HLT/PHOS/AliHLTPHOSGeometry.cxx @@ -47,7 +47,7 @@ void AliHLTPHOSGeometry::GetGlobalCoordinates ( AliHLTCaloRecPointDataStruct& re Float_t z = recPoint.fZ; ConvertRecPointCoordinates(x, z); - + TVector3 coord; fGeoUtils->Local2Global(fCaloConstants->GetNMODULES() - recPoint.fModule, x, z, coord); @@ -60,9 +60,8 @@ void AliHLTPHOSGeometry::GetGlobalCoordinates ( AliHLTCaloRecPointDataStruct& re void AliHLTPHOSGeometry::ConvertRecPointCoordinates(Float_t &x, Float_t &z) const { // See header file for class documentation - - x = (x - fCaloConstants->GetNXCOLUMNSMOD()/2)*fCaloConstants->GetCELLSTEP(); - z = (z - fCaloConstants->GetNZROWSMOD()/2)*fCaloConstants->GetCELLSTEP(); + x = (x - (float)(fCaloConstants->GetNXCOLUMNSMOD())/2)*fCaloConstants->GetCELLSTEP(); + z = (z - ((float)(fCaloConstants->GetNZROWSMOD()))/2)*fCaloConstants->GetCELLSTEP(); } int AliHLTPHOSGeometry::GetGeometryFromCDB() diff --git a/HLT/PHOS/AliHLTPHOSMapper.cxx b/HLT/PHOS/AliHLTPHOSMapper.cxx index 8681e5b416b..d4dd4769a19 100644 --- a/HLT/PHOS/AliHLTPHOSMapper.cxx +++ b/HLT/PHOS/AliHLTPHOSMapper.cxx @@ -220,9 +220,9 @@ AliHLTPHOSMapper::GetChannelID(AliHLTUInt32_t specification, Int_t hwAddress) // fHw2geomapPtr[hwAddress].fZRow, // fHw2geomapPtr[hwAddress].fGain); - // HLTError("HW add: %d -> x: %d, z: %d, gain: %d", hwAddress, fHw2geomapPtr[hwAddress].fXCol + fSpecificationMapPtr[index].fRcuXOffset, - // fHw2geomapPtr[hwAddress].fZRow + fSpecificationMapPtr[index].fRcuZOffset, - // fHw2geomapPtr[hwAddress].fGain); +/* HLTError("HW add: %d -> x: %d, z: %d, gain: %d", hwAddress, fHw2geomapPtr[hwAddress].fXCol + fSpecificationMapPtr[index].fRcuXOffset, + fHw2geomapPtr[hwAddress].fZRow + fSpecificationMapPtr[index].fRcuZOffset, + fHw2geomapPtr[hwAddress].fGain);*/ // HLTError("RCU X offset: %d", fSpecificationMapPtr[index].fRcuXOffset); // HLTError("RCU Z offset: %d", fSpecificationMapPtr[index].fRcuZOffset); return ((fHw2geomapPtr[hwAddress].fXCol + fSpecificationMapPtr[index].fRcuXOffset) | -- 2.43.5