- changes in the limits for the position of rec points in EMCAL
authorodjuvsla <odjuvsla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 28 Apr 2010 13:25:41 +0000 (13:25 +0000)
committerodjuvsla <odjuvsla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 28 Apr 2010 13:25:41 +0000 (13:25 +0000)
- define overflow as 900 counts
- removing y coordinate from rec point

HLT/CALO/AliHLTCaloDigitMaker.cxx
HLT/CALO/AliHLTCaloRecPointDataStruct.h
HLT/EMCAL/AliHLTEMCALGeometry.cxx

index 771c9a7..ef84e32 100644 (file)
@@ -257,7 +257,7 @@ void AliHLTCaloDigitMaker::AddDigit(AliHLTCaloChannelDataStruct* channelData, Al
   else\r
     {\r
       fDigitStructPtr->fEnergy = channelData->fEnergy*fLowGainFactors[coord.fX][coord.fZ];\r
-      if(channelData->fEnergy >= 1023)\r
+      if(channelData->fEnergy >= fMaxEnergy)\r
        {\r
          fDigitStructPtr->fOverflow = true;\r
        }\r
index f4f6776..9fa1ce2 100644 (file)
@@ -53,9 +53,6 @@ struct AliHLTCaloRecPointDataStruct
   /** x coordinate */
   Float_t fX;                                 //COMMENT
   
-  /** y coordinate */
-  Float_t fY;                                                                  //added, federico
-  
   /** z coordinate */ 
   Float_t fZ;                                 //COMMENT
 
index 13b0925..a7eb542 100644 (file)
@@ -83,16 +83,16 @@ AliHLTEMCALGeometry::GetGlobalCoordinates(AliHLTCaloRecPointDataStruct &recPoint
         Float_t E = recPoint.fAmp * 1000;
 
         //TVector3 v1;
-               Double_t glob[3];
-               Double_t loc[3];
+               Double_t glob[3] ={0,0,0};
+               Double_t loc[3] = {0,0,0};
 
-        if (recPoint.fZ >= 47.5 || recPoint.fZ<-0.5) {
-                Logging(kHLTLogError, "HLT", "EMCAL", "AliHLTEMCALGeometry::GetGlobalCoordinates: invalid Z recpoint ");
+        if (recPoint.fZ >= 47.51 || recPoint.fZ< -0.51) {
+                Logging(kHLTLogError, "HLT", "EMCAL", "AliHLTEMCALGeometry::GetGlobalCoordinates: invalid Z: %f from recpoint ", recPoint.fZ);
                 return;
          }
 
-         if (recPoint.fX >= 23.5 || recPoint.fX<-0.5) {
-                 Logging(kHLTLogError, "HLT", "EMCAL", "AliHLTEMCALGeometry::GetGlobalCoordinates: invalid X recpoint ");
+         if (recPoint.fX >= 23.51 || recPoint.fX< -0.51) {
+                 Logging(kHLTLogError, "HLT", "EMCAL", "AliHLTEMCALGeometry::GetGlobalCoordinates: invalid X: % from recpoint ", recPoint.fX);
                  return;
          }
 
@@ -204,7 +204,6 @@ void AliHLTEMCALGeometry::ConvertRecPointCoordinates(Double_t &x, Double_t &y, D
 int
 AliHLTEMCALGeometry::GetGeometryFromCDB()
 {
-  cout << "Getting geometry..." << endl;
 
  // AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 
@@ -222,7 +221,6 @@ AliHLTEMCALGeometry::GetGeometryFromCDB()
            }
 
          gGeoManager = (TGeoManager*) pEntry->GetObject();
-         cout<< "gGeoManager = 0x%x" << gGeoManager << endl;
 
          if(gGeoManager)
            {