Revert " - keeping both local and crystal coordinates in digits"

This reverts commit 13d3832f590d512fdb294fe952576d6712e6d2eb.

diff --git a/HLT/PHOS/AliHLTPHOSDigitDataStruct.h b/HLT/PHOS/AliHLTPHOSDigitDataStruct.h
index 68df983127ac07846a392af633b4a8e5fe347e8b..46e0f161209356227d68606f225e7d3dbdeb7ff9 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDigitDataStruct.h
+++ b/HLT/PHOS/AliHLTPHOSDigitDataStruct.h
@@ -20,6 +20,8 @@
 #ifndef ALIHLTPHOSDIGITDATASTRUCT_H
 #define ALIHLTPHOSDIGITDATASTRUCT_H
 
+#include "Rtypes.h"
+
 /**
  * Digit struct for PHOS HLT
  *
@@ -44,16 +46,10 @@
 struct AliHLTPHOSDigitDataStruct
 {
   /** The x coordinate */
-  Int_t fX;
+  Float_t fX;
 
   /** The x coordinate */
-  Int_t fZ;
-
-  /** The x local coordinate */
-  Int_t fLocX;
-
-  /** The x local coordinate */
-  Int_t fLocZ;
+  Float_t fZ;
 
   /** The module number */
   Int_t fModule;

diff --git a/HLT/PHOS/AliHLTPHOSDigitMaker.cxx b/HLT/PHOS/AliHLTPHOSDigitMaker.cxx
index f3ccc20834b9d52c7bd3c76db7a0e7ab5d65e722..9ad7c4bf7eeda368bf70356a06487d064a23ae0d 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDigitMaker.cxx
+++ b/HLT/PHOS/AliHLTPHOSDigitMaker.cxx
@@ -15,7 +15,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
  /** 
- * @file   AliHLTPHOSDigitMaker.cxx
+ * @file   AliHLTPHOSClusterizer.cxx
  * @author Oystein Djuvsland
  * @date 
  * @brief  Digit maker for PHOS HLT  
@@ -47,7 +47,7 @@ ClassImp(AliHLTPHOSDigitMaker);
 using namespace PhosHLTConst;
 
 AliHLTPHOSDigitMaker::AliHLTPHOSDigitMaker() :
-  AliHLTPHOSBase(),
+  //  AliHLTPHOSBase(),
   fShmPtr(0),
   fDigitStructPtr(0),
   fDigitCount(0),

diff --git a/HLT/PHOS/AliHLTPHOSDigitMaker.h b/HLT/PHOS/AliHLTPHOSDigitMaker.h
index dc451571463fe25632082c3dce713e983210399f..74ce80d6dcb4cee85424420e41014c8ec07d2e18 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDigitMaker.h
+++ b/HLT/PHOS/AliHLTPHOSDigitMaker.h
@@ -34,10 +34,11 @@
 // or
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 
-#include "AliHLTPHOSBase.h"
+//#include "AliHLTPHOSBase.h"
 #include "AliHLTPHOSConstants.h"
 #include "AliHLTPHOSDigitDataStruct.h"
 #include "AliHLTPHOSChannelDataStruct.h"
+#include "AliHLTDataTypes.h"
 
 /**
  * @class AliHLTPHOSDigitMaker
@@ -53,7 +54,8 @@ class AliHLTPHOSMapper;
        
 using namespace PhosHLTConst;
 
-class AliHLTPHOSDigitMaker : public AliHLTPHOSBase
+//class AliHLTPHOSDigitMaker : public AliHLTPHOSBase
+class AliHLTPHOSDigitMaker
 {
 public:
 
@@ -65,7 +67,7 @@ public:
 
   /** Copy constructor */  
   AliHLTPHOSDigitMaker(const AliHLTPHOSDigitMaker &) : 
-    AliHLTPHOSBase(),
+    //    AliHLTPHOSBase(),
     fShmPtr(0),
     fDigitStructPtr(0),
     fDigitCount(0),
@@ -133,13 +135,8 @@ private:
    */
   void AddDigit(AliHLTPHOSChannelDataStruct* channelData, UShort_t* channelCoordinates, Float_t* localCoordinates)
   {
-    fDigitStructPtr->fX = channelCoordinates[0];
-    fDigitStructPtr->fZ = channelCoordinates[1];
-    fDigitStructPtr->fLocX = localCoordinates[0];
-    fDigitStructPtr->fLocZ = localCoordinates[1];
-
-    fDigitStructPtr->fGain = channelCoordinates[2];
-
+    fDigitStructPtr->fX = localCoordinates[0];
+    fDigitStructPtr->fZ = localCoordinates[1];
     if(channelCoordinates[2] == HIGHGAIN)
       {
        fDigitStructPtr->fEnergy = channelData->fEnergy*fHighGainFactors[channelCoordinates[0]][channelCoordinates[1]];
@@ -150,7 +147,6 @@ private:
        fDigitStructPtr->fEnergy = channelData->fEnergy*fLowGainFactors[channelCoordinates[0]][channelCoordinates[1]];
        //      printf("LG channel (x = %d, z = %d) with amplitude: %f --> Digit with energy: %f\n", channelCoordinates[0], channelCoordinates[1], channelData->fEnergy, fDigitStructPtr->fEnergy); 
       }
-
     fDigitStructPtr->fTime = channelData->fTime * 0.0000001; //TODO
     fDigitStructPtr->fCrazyness = channelData->fCrazyness;
     fDigitStructPtr->fModule = channelCoordinates[3];