cleaning up HLT defines

[u/mrichter/AliRoot.git] / HLT / TRD / AliHLTTRDCalibFitComponent.cxx

diff --git a/HLT/TRD/AliHLTTRDCalibFitComponent.cxx b/HLT/TRD/AliHLTTRDCalibFitComponent.cxx
index 942e8b166710de53a88019786e3791ef0a18a0f2..43a6963e47cba16d35ec3486be7aa7fd97bdb56e 100644 (file)
--- a/HLT/TRD/AliHLTTRDCalibFitComponent.cxx
+++ b/HLT/TRD/AliHLTTRDCalibFitComponent.cxx
@@ -21,10 +21,6 @@
 //  @brief  A TRDCalibration fitting component for the HLT. 
 // 
 
-#if __GNUC__ >= 3
-using namespace std;
-#endif
-
 #include "TTree.h"
 #include "TFile.h"
 #include "TBranch.h"
@@ -57,16 +53,23 @@ using namespace std;
 #include <cerrno>
 #include <string>
 
+using namespace std;
+
 ClassImp(AliHLTTRDCalibFitComponent);
 
 AliHLTTRDCalibFitComponent::AliHLTTRDCalibFitComponent()
   : AliHLTCalibrationProcessor(),
     fOutputSize(500000),
     fOutArray(NULL),
-    fTempArray(NULL),
-    fAfterRunArray(NULL)
+    fAfterRunArray(NULL),
+    fNoOfSM(0),
+    fNoOfIncSM(0)
 {
   // Default constructor
+
+  for(int i=0; i<18; i++)
+    fIncSM[i]=kFALSE;
+
 }
 
 AliHLTTRDCalibFitComponent::~AliHLTTRDCalibFitComponent()
@@ -135,9 +138,6 @@ Int_t AliHLTTRDCalibFitComponent::DeinitCalibration()
   
   HLTDebug("DeinitCalibration");
   //fOutArray->Delete();
-  if(fTempArray){
-    delete fTempArray; fTempArray=0;
-  }
   delete fOutArray; fOutArray=0;
   fAfterRunArray->Delete();
   delete fAfterRunArray; fAfterRunArray=0;
@@ -170,37 +170,41 @@ Int_t AliHLTTRDCalibFitComponent::ProcessCalibration(const AliHLTComponent_Event
 
     if(SM!=lastSM){
       if(fIncSM[SM]){
-       PushBack(fTempArray, AliHLTTRDDefinitions::fgkCalibrationDataType);
+       if(fNoOfIncSM<fNoOfSM)
+         return 0;
+       fNoOfSM=fNoOfIncSM;
+       PushBack(fOutArray, AliHLTTRDDefinitions::fgkCalibrationDataType);
        fOutArray->Delete();
        delete fOutArray;
-       fOutArray = fTempArray;
-       fTempArray = NULL;
+       fOutArray = NULL;
        for(int i=0; i<18; i++)
          fIncSM[i]=kFALSE;
+       fNoOfIncSM=0;
       }
       lastSM = SM;
       fIncSM[SM]=kTRUE;
+      fNoOfIncSM++;
     }
 
-    if(!fTempArray) fTempArray = (TObjArray*)iter->Clone();
+    if(!fOutArray) fOutArray = (TObjArray*)iter->Clone();
     else{
       TObjArray* inArr = (TObjArray*)iter;
       for(int i = inArr->GetEntriesFast(); i--;){
        const TH1* histo = dynamic_cast<const TH1*>(inArr->At(i));
        if(histo){
-         if(fTempArray->At(i)){
-           ((TH1*)fTempArray->At(i))->Add(histo);
+         if(fOutArray->At(i)){
+           ((TH1*)fOutArray->At(i))->Add(histo);
          }else{
-           fTempArray->AddAt(histo->Clone(), i);
+           fOutArray->AddAt(histo->Clone(), i);
          }
          continue;
        }
        AliTRDCalibraVdriftLinearFit* obj = dynamic_cast<AliTRDCalibraVdriftLinearFit*>(inArr->At(i));
        if(obj){
-         if(fTempArray->At(i)){
-           ((AliTRDCalibraVdriftLinearFit*)fTempArray->At(i))->Add(obj);
+         if(fOutArray->At(i)){
+           ((AliTRDCalibraVdriftLinearFit*)fOutArray->At(i))->Add(obj);
          }else{
-           fTempArray->AddAt(new AliTRDCalibraVdriftLinearFit(*obj), i);
+           fOutArray->AddAt(new AliTRDCalibraVdriftLinearFit(*obj), i);
          }
        }
       }
@@ -213,8 +217,6 @@ Int_t AliHLTTRDCalibFitComponent::ProcessCalibration(const AliHLTComponent_Event
 
 Int_t AliHLTTRDCalibFitComponent::ShipDataToFXS(const AliHLTComponentEventData& /*evtData*/, AliHLTComponentTriggerData& /*trigData*/)
 {
-  //fTRDCalibraFillHisto->DestroyDebugStreamer();
-
   AliHLTReadoutList rdList(AliHLTReadoutList::kTRD);
 
   EORCalibration();
@@ -241,7 +243,7 @@ Int_t AliHLTTRDCalibFitComponent::ShipDataToFXS(const AliHLTComponentEventData&
 
   HLTDebug("Size of the fOutArray is %d\n",fOutArray->GetEntriesFast());
 
-  PushToFXS((TObject*)fOutArray, "TRD", "GAINDRIFTPRF", rdList.Buffer() );
+  PushToFXS((TObject*)fOutArray, "TRD", "GAINDRIFTPRF", &rdList );
   //PushToFXS((TObject*)fOutArray->FindObject("CH2d"), "TRD", "GAINDRIFTPRF", rdList.Buffer() );
 
   return 0;
@@ -264,10 +266,10 @@ Int_t AliHLTTRDCalibFitComponent::EORCalibration()
   //Gain
   calibra->SetMinEntries(100);
   calibra->AnalyseCH(hCH2d);
-  Int_t nbtg = 6*4*18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb0(0))
-    + 6*  18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb2(0));
-  Int_t nbfit       = calibra->GetNumberFit();
-  Int_t nbE         = calibra->GetNumberEnt();
+  //Int_t nbtg = 6*4*18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb0(0))
+  //  + 6*  18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb2(0));
+  //Int_t nbfit       = calibra->GetNumberFit();
+  //Int_t nbE         = calibra->GetNumberEnt();
   TH1F *coefgain = 0x0;
   // enough statistics
   //if ((nbtg >                  0) && 
@@ -284,9 +286,9 @@ Int_t AliHLTTRDCalibFitComponent::EORCalibration()
   calibra->SetMinEntries(100); // If there is less than 100
   hVdriftLinearFit->FillPEArray();
   calibra->AnalyseLinearFitters(hVdriftLinearFit);
-  nbtg = 540;
-  nbfit = calibra->GetNumberFit();
-  nbE   = calibra->GetNumberEnt();
+  //nbtg = 540;
+  //nbfit = calibra->GetNumberFit();
+  //nbE   = calibra->GetNumberEnt();
   TH1F *coefdriftsecond = 0x0;
   // enough statistics
   //if ((nbtg >                  0) && 
@@ -303,10 +305,10 @@ Int_t AliHLTTRDCalibFitComponent::EORCalibration()
   // vdrift first method
   calibra->SetMinEntries(100*20); // If there is less than 20000
   calibra->AnalysePH(hPH2d);
-  nbtg = 6*4*18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb0(1))
-    + 6*  18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb2(1));
-  nbfit        = calibra->GetNumberFit();
-  nbE          = calibra->GetNumberEnt();
+  //nbtg = 6*4*18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb0(1))
+  //  + 6*  18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb2(1));
+  //nbfit        = calibra->GetNumberFit();
+  //nbE          = calibra->GetNumberEnt();
   TH1F *coefdrift = 0x0;
   TH1F *coeft0 = 0x0;
   // enough statistics
@@ -328,10 +330,10 @@ Int_t AliHLTTRDCalibFitComponent::EORCalibration()
   //PRF
   calibra->SetMinEntries(200); 
   calibra->AnalysePRFMarianFit(hPRF2d);
-  nbtg = 6*4*18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb0(2))
-    + 6*  18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb2(2));
-  nbfit        = calibra->GetNumberFit();
-  nbE          = calibra->GetNumberEnt();
+  //nbtg = 6*4*18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb0(2))
+  //  + 6*  18*((Int_t) ((AliTRDCalibraMode *)calibra->GetCalibraMode())->GetDetChamb2(2));
+  //nbfit        = calibra->GetNumberFit();
+  //nbE          = calibra->GetNumberEnt();
   TH1F *coefprf = 0x0;
   // enough statistics
   //if ((nbtg >                  0) && 
@@ -349,16 +351,13 @@ Int_t AliHLTTRDCalibFitComponent::EORCalibration()
   coefdrift->SetName("coefdrift");
   coefdriftsecond->SetName("coefdriftsecond");
   coeft0->SetName("coeft0");
-  if(coefgain) fAfterRunArray->Add(coefgain);
-  if(coefprf) fAfterRunArray->Add(coefprf);
-  if(coefdrift) fAfterRunArray->Add(coefdrift);
-  if(coefdriftsecond) fAfterRunArray->Add(coefdriftsecond);
-  if(coeft0) fAfterRunArray->Add(coeft0);
+  fAfterRunArray->Add(coefgain);
+  fAfterRunArray->Add(coefprf);
+  fAfterRunArray->Add(coefdrift);
+  fAfterRunArray->Add(coefdriftsecond);
+  fAfterRunArray->Add(coeft0);
   
-
-  if(coefgain||coefprf||coefdrift||coeft0||coefdriftsecond) {
-    PushBack(fAfterRunArray, AliHLTTRDDefinitions::fgkEORCalibrationDataType);
-  }
+  PushBack(fAfterRunArray, AliHLTTRDDefinitions::fgkEORCalibrationDataType);
 
   // TString fileName="/tmp/CalibHistoDump_run";
   // fileName+=AliCDBManager::Instance()->GetRun();