- fixing bug in digit maker + clusterizer

- cleaning up reco macro

diff --git a/HLT/PHOS/AliHLTPHOSClusterizer.cxx b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
index 8e105e6036aff8618633ac2eb5b3c53f399d6557..4ee41e0b4b716fbf5b34c951ca82293bfb126885 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizer.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
@@ -189,36 +189,18 @@ AliHLTPHOSClusterizer::AreNeighbours(AliHLTPHOSDigitDataStruct* digit1,
   //see header file for documentation
   if ( (digit1->fModule == digit2->fModule) /*&& (coord1[1]==coord2[1])*/ ) // inside the same PHOS module
     { 
-//       Int_t rowdiff = TMath::Abs( digit1->fZ - digit2->fZ );  
-//       Int_t coldiff = TMath::Abs( digit1->fX - digit2->fX ); 
-//       if (( coldiff <= 1   &&  rowdiff == 0 ) || ( coldiff == 0 &&  rowdiff <= 1 ))
-//     {
-//       cout << "Are neighbours: digit (E = "  << digit1->fEnergy << ") with x = " << digit1->fX << " and z = " << digit1->fZ << 
-//         " is neighbour with digit (E = " << digit2->fEnergy << ") with x = " << digit2->fX << " and z = " << digit2->fZ << endl;
-
-//       if(TMath::Abs(digit1->fTime - digit2->fTime ) < fEmcTimeGate)
-//         {
-//           return 1; 
-//         }
-//     }
-
-      Float_t rowdiff = TMath::Abs( digit1->fZ - digit2->fZ );  
-      Float_t coldiff = TMath::Abs( digit1->fX - digit2->fX ); 
-      if (( coldiff <= 2.4   &&  rowdiff < 0.4 ) || ( coldiff < 0.4 &&  rowdiff <= 2.4 ))
+      Int_t rowdiff = TMath::Abs( digit1->fZ - digit2->fZ );  
+      Int_t coldiff = TMath::Abs( digit1->fX - digit2->fX ); 
+      if (( coldiff <= 1   &&  rowdiff == 0 ) || ( coldiff == 0 &&  rowdiff <= 1 ))
        {
          //      cout << "Are neighbours: digit (E = "  << digit1->fEnergy << ") with x = " << digit1->fX << " and z = " << digit1->fZ << 
-         //        " is neighbour with digit (E = " << digit2->fEnergy << ") with x = " << digit2->fX << " and z = " << digit2->fZ << endl;
+           //      " is neighbour with digit (E = " << digit2->fEnergy << ") with x = " << digit2->fX << " and z = " << digit2->fZ << endl;
 
          if(TMath::Abs(digit1->fTime - digit2->fTime ) < fEmcTimeGate)
            {
              return 1; 
            }
        }
-      else
-       {
-         //  cout << "Not neighbours: digit (E = "  << digit1->fEnergy << ") with x = " << digit1->fX << " and z = " << digit1->fZ << 
-         //  " is not neighbour with digit (E = " << digit2->fEnergy << ") with x = " << digit2->fX << " and z = " << digit2->fZ << endl;
-       }
     }
   return 0;
 }

diff --git a/HLT/PHOS/macros/rec-hlt-phos-v3.C b/HLT/PHOS/macros/rec-hlt-phos-v3.C
index d47a9135fabbfb63fe449bd35ce9506a066cdfda..beaf5f914516e2e87d4e35a706ca85adc913439f 100644 (file)
--- a/HLT/PHOS/macros/rec-hlt-phos-v3.C
+++ b/HLT/PHOS/macros/rec-hlt-phos-v3.C
@@ -5,7 +5,7 @@
 void rec_hlt_phos()//, char* opt="decoder ESD")
 {
   //  AliCDBManager::Instance()->SetDefaultStorage("raw://");
-  AliCDBManager::Instance()->SetDefaultStorage("raw://");
+  //  AliCDBManager::Instance()->SetDefaultStorage("raw://");
   if(!gSystem->AccessPathName("galice.root")){
     cerr << "please delete the galice.root or run at different place." << endl;
     return;
@@ -49,8 +49,8 @@ void rec_hlt_phos()//, char* opt="decoder ESD")
          // Raw analyzer
          arg = "";
          ra.Form("PHS-RA_%02d_%d", module, rcu);
-         //      AliHLTConfiguration rawConf(ra.Data(), "PhosRawCrudev2", publisher.Data(), arg.Data())
-;        AliHLTConfiguration rawConf(ra.Data(), "PhosRawCrudev3", publisher.Data(), arg.Data());
+         //      AliHLTConfiguration rawConf(ra.Data(), "PhosRawCrudev2", publisher.Data(), arg.Data());
+         AliHLTConfiguration rawConf(ra.Data(), "PhosRawCrude", publisher.Data(), arg.Data());
          
          // digit maker components
          dm.Form("PHS-DM_%02d_%d", module, rcu);
@@ -80,12 +80,11 @@ void rec_hlt_phos()//, char* opt="decoder ESD")
 
   TString arg, ec, em, hp, ef;
   
-  em.Form("ESD-MAKER");
 
   ec.Form("ESD-CONVERTER");
   arg = "";
 
-  AliHLTConfiguration emConf(em.Data(), "PhosEsdEntriesMaker", ecInput.Data(), "");
+  //  AliHLTConfiguration emConf(em.Data(), "PhosEsdEntriesMaker", ecInput.Data(), "");
 
   AliHLTConfiguration esdcconf(ec.Data(), "GlobalEsdConverter"   , ecInput.Data(), "");