- fixed wrong constant

- cosmetics

diff --git a/HLT/PHOS/AliHLTPHOSConstants.cxx b/HLT/PHOS/AliHLTPHOSConstants.cxx
index 0fd010c4504694ed934f4a17d6cbd3d017ab4388..901666c5afd50689c6f00a64f71880898ac85132 100644 (file)
--- 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 ed92544a24c6a36edf18e8b750210012fb3076d1..ac909ee42adb2a2293953799beb8ae72543227cb 100644 (file)
--- 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 8681e5b416b9e002cf7ce2ef7477eca9dc636f72..d4dd4769a19a17a9776e8970b38839bb1bf87ba2 100644 (file)
--- 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) |