Updates

sevdokim · Jun 27, 2013 · 8de37ff · 8de37ff
1 parent 189e22d
commit 8de37ff
Show file tree

Hide file tree

Showing 53 changed files with 2,382 additions and 600 deletions.
diff --git a/ANALYSIS/AliTRDTriggerAnalysis.cxx b/ANALYSIS/AliTRDTriggerAnalysis.cxx
@@ -22,8 +22,8 @@
 
 #include "AliLog.h"
 #include "AliVTrack.h"
-#include "AliESDEvent.h"
-#include "AliESDTrdTrack.h"
+#include "AliVEvent.h"
+#include "AliVTrdTrack.h"
 
 #include "AliTRDTriggerAnalysis.h"
 
@@ -54,30 +54,30 @@ AliTRDTriggerAnalysis::~AliTRDTriggerAnalysis()
   // dtor
 }
 
-Bool_t AliTRDTriggerAnalysis::CalcTriggers(const AliESDEvent *esdEvent)
+Bool_t AliTRDTriggerAnalysis::CalcTriggers(const AliVEvent *event)
 {
   // evaluate the TRD trigger conditions,
   // so far HCO, HSE, HQU, HJT, HEE
 
   ResetTriggers();
 
-  if (!esdEvent) {
-    AliErrorClass("ESD event pointer is null");
+  if (!event) {
+    AliErrorClass("event pointer is null");
     return kFALSE;
   }
 
-  TString trgClasses = esdEvent->GetFiredTriggerClasses();
-  // UInt_t  trgInputs  = esdEvent->GetHeader()->GetL1TriggerInputs();
+  TString trgClasses = event->GetFiredTriggerClasses();
+  // UInt_t  trgInputs  = event->GetHeader()->GetL1TriggerInputs();
 
   Int_t nTracks[90]      = { 0 }; // stack-wise counted number of tracks above pt threshold
 
-  Int_t nTrdTracks = esdEvent->GetNumberOfTrdTracks();
+  Int_t nTrdTracks = event->GetNumberOfTrdTracks();
 
   if (nTrdTracks > 0)
     Fire(kHCO);
 
   for (Int_t iTrack = 0; iTrack < nTrdTracks; ++iTrack) {
-    AliESDTrdTrack *trdTrack = esdEvent->GetTrdTrack(iTrack);
+    AliVTrdTrack *trdTrack = event->GetTrdTrack(iTrack);
     if (!trdTrack)
       continue;
 

diff --git a/ANALYSIS/AliTRDTriggerAnalysis.h b/ANALYSIS/AliTRDTriggerAnalysis.h
@@ -11,7 +11,7 @@
 #ifndef ALITRDTRIGGERANALYSIS_H
 #define ALITRDTRIGGERANALYSIS_H
 
-class AliESDEvent;
+class AliVEvent;
 
 class AliTRDTriggerAnalysis : public TObject
 {
@@ -22,7 +22,7 @@ class AliTRDTriggerAnalysis : public TObject
   enum TRDTrigger_t { kHCO = 0, kHJT, kHSE, kHQU, kHEE };
 
   void ResetTriggers() { fTriggerFlags = fTriggerInputs = fTriggerClasses = 0; }
-  Bool_t CalcTriggers(const AliESDEvent* esdEvent);
+  Bool_t CalcTriggers(const AliVEvent* event);
 
   Bool_t IsFired(TRDTrigger_t trg) const { return (fTriggerFlags & (1 << trg)); }
 

diff --git a/EMCAL/AliEMCALRawUtils.cxx b/EMCAL/AliEMCALRawUtils.cxx
@@ -29,6 +29,7 @@
 //*-- Author: Marco van Leeuwen (LBL)
 //*-- Major refactoring by Per Thomas Hille
 
+//#include "AliCDBManager.h"
 #include "AliEMCALRawUtils.h"
 #include "AliRun.h"
 #include "AliRunLoader.h"
@@ -300,9 +301,14 @@ void AliEMCALRawUtils::Raw2Digits(AliRawReader* reader,TClonesArray *digitsArr,
 
   Float_t bcTimePhaseCorr = 0; // for BC-based L1 phase correction
   Int_t bcMod4 = (reader->GetBCID() % 4); // LHC uses 40 MHz, EMCal uses 10 MHz clock
-  if (bcMod4==0 || bcMod4==1) { 
+
+  //AliCDBManager* man = AliCDBManager::Instance();
+  //Int_t runNumber = man->GetRun();
+
+ Int_t runNumber = reader->GetRunNumber();
+
+  if ((runNumber >130850 ) && (bcMod4==0 || bcMod4==1)) 
     bcTimePhaseCorr = -1e-7; // subtract 100 ns for certain BC values
-  } 
 
   while (in.NextDDL()) 
     {

diff --git a/HLT/CMakelibAliHLTTPC.pkg b/HLT/CMakelibAliHLTTPC.pkg
@@ -32,6 +32,7 @@ set ( CLASS_HDRS
     transform/AliHLTTPCSpline2D3D.h
     transform/AliHLTTPCFastTransform.h
     AliHLTTPCClusterTransformation.h
+    AliHLTTPCClusterTransformationComponent.h
     AliHLTTPCAgent.h
     AliHLTTPCMemHandler.h
     AliHLTTPCFileHandler.h
@@ -116,6 +117,7 @@ set ( CLASS_HDRS
     HWCFemulator/AliHLTTPCHWCFConsistencyControlComponent.h
     HWCFemulator/AliHLTTPCHWClusterMerger.h
     HWCFemulator/AliHLTTPCHWClusterMergerV1.h
+    AliHLTTPCHWClusterDecoderComponent.h
 )
 
 string ( REPLACE ".h" ".cxx" MODULE_SRCS "${CLASS_HDRS}")

diff --git a/HLT/TPCLib/AliHLTTPCAgent.cxx b/HLT/TPCLib/AliHLTTPCAgent.cxx
@@ -62,6 +62,8 @@ AliHLTTPCAgent gAliHLTTPCAgent;
 #include "AliHLTTPCDataCompressionMonitorComponent.h"
 #include "AliHLTTPCDataCompressionFilterComponent.h"
 #include "AliHLTTPCDataPublisherComponent.h"
+#include "AliHLTTPCHWClusterDecoderComponent.h"
+#include "AliHLTTPCClusterTransformationComponent.h"
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCAgent)
@@ -147,19 +149,32 @@ int AliHLTTPCAgent::CreateConfigurations(AliHLTConfigurationHandler* handler,
 	handler->CreateConfiguration(hwcfemu.Data(), "TPCHWClusterFinderEmulator", publisher.Data(), arg.Data());
 	if (hwclustOutput.Length()>0) hwclustOutput+=" ";
 	hwclustOutput+=hwcfemu;
-
+	
 	TString hwcf;
 	hwcf.Form("TPC-HWCF_%02d_%d", slice, part);
 	handler->CreateConfiguration(hwcf.Data(), "TPCHWClusterTransform",hwcfemu.Data(), "-publish-raw");
 
-	if (trackerInput.Length()>0) trackerInput+=" ";
-	trackerInput+=hwcf;
-	if (dEdXInput.Length()>0) dEdXInput+=" ";
-	dEdXInput+=hwcf;
-	if (sinkHWClusterInput.Length()>0) sinkHWClusterInput+=" ";
-	sinkHWClusterInput+=hwcf;
+	//if (trackerInput.Length()>0) trackerInput+=" ";
+	//trackerInput+=hwcf;
+	//if (dEdXInput.Length()>0) dEdXInput+=" ";
+	//dEdXInput+=hwcf;
+	//if (sinkHWClusterInput.Length()>0) sinkHWClusterInput+=" ";
+	//sinkHWClusterInput+=hwcf;       
       }
     }
+
+    TString hwcfDecoder = "TPC-HWCFDecoder";
+    handler->CreateConfiguration(hwcfDecoder.Data(), "TPCHWClusterDecoder",hwclustOutput.Data(), "");
+
+    TString clusterTransformation = "TPC-ClusterTransformation";
+    handler->CreateConfiguration(clusterTransformation.Data(), "TPCClusterTransformation",hwcfDecoder.Data(), "");
+
+    if (trackerInput.Length()>0) trackerInput+=" ";
+    trackerInput+=clusterTransformation;
+    if (dEdXInput.Length()>0) dEdXInput+=" ";
+    dEdXInput+=clusterTransformation;
+    if (sinkHWClusterInput.Length()>0) sinkHWClusterInput+=" ";
+    sinkHWClusterInput+=clusterTransformation;
 
     // tracker finder component
     // 2012-01-05 changing the configuration according to online setup
@@ -185,7 +200,8 @@ int AliHLTTPCAgent::CreateConfigurations(AliHLTConfigurationHandler* handler,
 
     // compression component
     if (compressorInput.Length()>0) compressorInput+=" ";
-    compressorInput+=hwclustOutput;
+    //compressorInput+=hwclustOutput;
+    compressorInput+=hwcfDecoder;
 
     // special configuration to run the emulation automatically if the compressed clusters
     // of a particular partition is missing. This configuration is announced for reconstruction
@@ -351,6 +367,8 @@ int AliHLTTPCAgent::RegisterComponents(AliHLTComponentHandler* pHandler) const
   pHandler->AddComponent(new AliHLTTPCDataCompressionMonitorComponent);
   pHandler->AddComponent(new AliHLTTPCDataCompressionFilterComponent);
   pHandler->AddComponent(new AliHLTTPCDataPublisherComponent);
+  pHandler->AddComponent(new AliHLTTPCHWClusterDecoderComponent);
+  pHandler->AddComponent(new AliHLTTPCClusterTransformationComponent);
   return 0;
 }
 

diff --git a/HLT/TPCLib/AliHLTTPCClusterAccessHLTOUT.cxx b/HLT/TPCLib/AliHLTTPCClusterAccessHLTOUT.cxx
@@ -237,7 +237,6 @@ int AliHLTTPCClusterAccessHLTOUT::ProcessClusters(const char* params)
   AliHLTTPCDataCompressionDecoder& decoder=*fpDecoder;
   decoder.Clear();
   decoder.SetVerbosity(fVerbosity);
-  decoder.EnableClusterMerger();
 
   bool bNextBlock=false;
   // add cluster id and mc information data blocks
@@ -253,6 +252,12 @@ int AliHLTTPCClusterAccessHLTOUT::ProcessClusters(const char* params)
     if (pHLTOUT->GetDataBlockDescription(desc.fDataType, desc.fSpecification)<0) {
       continue;
     }
+    if (desc.fDataType==AliHLTTPCDefinitions::DataCompressionDescriptorDataType()) {
+      // header      
+      if ((iResult=decoder.AddCompressionDescriptor(&desc))<0) {
+	return iResult;
+      }
+    }
     if (desc.fDataType==AliHLTTPCDefinitions::AliHLTDataTypeClusterMCInfo()) {
       // add mc information
       if ((iResult=decoder.AddClusterMCData(&desc))<0) {