]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HLT/TRD/AliHLTTRDCalibrationComponent.cxx
correcting small memory leak, removing unnecessary pointer checks (Theo)
[u/mrichter/AliRoot.git] / HLT / TRD / AliHLTTRDCalibrationComponent.cxx
index 80414e292ee055fac9cb106760a2be06b8264638..6a4b618ee852b2fe280bc130e31c6e960be30131 100644 (file)
@@ -3,9 +3,8 @@
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
- * Authors: Matthias Richter <Matthias.Richter@ift.uib.no>                *
- *          Timm Steinbeck <timm@kip.uni-heidelberg.de>                   *
- *          for The ALICE Off-line Project.                               *
+ * Authors:                                                               *
+ *          for The ALICE HLT Project.                                    *
  *                                                                        *
  * Permission to use, copy, modify and distribute this software and its   *
  * documentation strictly for non-commercial purposes is hereby granted   *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/** @file   AliHLTTRDCalibrationComponent.cxx
-    @author Timm Steinbeck, Matthias Richter
-    @date   
-    @brief  A TRDCalibration processing component for the HLT. */
+//  @file   AliHLTTRDCalibrationComponent.cxx
+//  @author 
+//  @date
+//  @brief  A TRDCalibration processing component for the HLT. 
+// 
 
 #if __GNUC__ >= 3
 using namespace std;
@@ -28,32 +28,53 @@ using namespace std;
 #include "TTree.h"
 #include "TFile.h"
 #include "TBranch.h"
+#include "TH2I.h"
+#include "TH2.h"
+#include "TProfile2D.h"
+
+#include "AliHLTReadoutList.h"
 
 #include "AliHLTTRDCalibrationComponent.h"
 #include "AliHLTTRDDefinitions.h"
-#include "AliHLTTRDTrack.h"
+#include "AliHLTTRDUtils.h"
 
 #include "AliCDBManager.h"
-#include "AliTRDclusterizerHLT.h"
+#include "AliCDBStorage.h"
 #include "AliRawReaderMemory.h"
+
+#include "AliTRDCalPad.h"
+#include "AliTRDCalDet.h"
+
 #include "AliTRDCalibraFillHisto.h"
+#include "AliTRDtrackV1.h"
+
+#include "AliTRDCalibraFit.h"
+#include "AliTRDCalibraMode.h"
+#include "AliTRDCalibraVector.h"
+#include "AliTRDCalibraVdriftLinearFit.h"
+#include "AliTRDReconstructor.h"
+#include "AliTRDrecoParam.h"
 
 #include <cstdlib>
 #include <cerrno>
 #include <string>
 
-// this is a global object used for automatic component registration, do not use this
-AliHLTTRDCalibrationComponent gAliHLTTRDCalibrationComponent;
-
 ClassImp(AliHLTTRDCalibrationComponent);
-   
-AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent():
-  AliHLTCalibrationProcessor(),
-  fTRDCalibraFillHisto(NULL),
-  fUseHLTTracks(kFALSE),
-  fOutputPercentage(100), // By default we copy to the output exactly what we got as input  
-  fStrorageDBpath("local://$ALICE_ROOT"),
-  fCDB(NULL)
+
+AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent()
+  : AliHLTCalibrationProcessor(),
+    fTRDCalibraFillHisto(NULL),
+    fOutputSize(500000),
+    fTracksArray(NULL),
+    fOutArray(NULL),
+    fAfterRunArray(NULL),
+    fDisplayArray(NULL),
+    fSavedTimeBins(kFALSE),
+    fTrgStrings(NULL),
+    fAccRejTrg(0),
+    fMinClusters(0),
+    fMinTracklets(0),
+    fTakeAllEvents(kFALSE)
 {
   // Default constructor
 }
@@ -61,7 +82,6 @@ AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent():
 AliHLTTRDCalibrationComponent::~AliHLTTRDCalibrationComponent()
 {
   // Destructor
-  ;
 }
 
 const char* AliHLTTRDCalibrationComponent::GetComponentID()
@@ -70,24 +90,35 @@ const char* AliHLTTRDCalibrationComponent::GetComponentID()
   return "TRDCalibration"; // The ID of this component
 }
 
-void AliHLTTRDCalibrationComponent::GetInputDataTypes( vector<AliHLTComponent_DataType>& list)
+void AliHLTTRDCalibrationComponent::GetInputDataTypes( vector<AliHLTComponentDataType>& list)
 {
   // Get the list of input data
   list.clear(); // We do not have any requirements for our input data type(s).
-  list.push_back( AliHLTTRDDefinitions::fgkTRDSATracksDataType );
+  list.push_back(AliHLTTRDDefinitions::fgkTracksDataType);
+}
+
+AliHLTComponentDataType AliHLTTRDCalibrationComponent::GetOutputDataType()
+{
+  // Get the output data type
+  return kAliHLTMultipleDataType;
+  //  return AliHLTTRDDefinitions::fgkCalibrationDataType;
 }
 
-AliHLTComponent_DataType AliHLTTRDCalibrationComponent::GetOutputDataType()
+int AliHLTTRDCalibrationComponent::GetOutputDataTypes(AliHLTComponentDataTypeList& tgtList)
 {
   // Get the output data type
-  return AliHLTTRDDefinitions::fgkCalibrationDataType;
+  tgtList.clear();
+  tgtList.push_back(AliHLTTRDDefinitions::fgkCalibrationDataType);
+  tgtList.push_back(AliHLTTRDDefinitions::fgkEORCalibrationDataType);
+  return tgtList.size();
 }
 
 void AliHLTTRDCalibrationComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier )
 {
   // Get the output data size
-  constBase = 0;
-  inputMultiplier = ((double)fOutputPercentage)/100.0;
+  constBase = fOutputSize;
+  inputMultiplier = 0;
 }
 
 AliHLTComponent* AliHLTTRDCalibrationComponent::Spawn()
@@ -99,262 +130,464 @@ AliHLTComponent* AliHLTTRDCalibrationComponent::Spawn()
 Int_t AliHLTTRDCalibrationComponent::ScanArgument( int argc, const char** argv )
 {
   // perform initialization. We check whether our relative output size is specified in the arguments.
-  fOutputPercentage = 100;
   int i = 0;
   char* cpErr;
+  if(!fTrgStrings)
+    fTrgStrings = new TObjArray();
+
   while ( i < argc )
     {
       HLTDebug("argv[%d] == %s", i, argv[i] );
-      if ( !strcmp( argv[i], "output_percentage" ) )
-       {
-         if ( i+1>=argc )
-           {
-             HLTError("Missing output_percentage parameter");
-             return ENOTSUP;
-           }
-         HLTDebug("argv[%d+1] == %s", i, argv[i+1] );
-         fOutputPercentage = strtoul( argv[i+1], &cpErr, 0 );
-         if ( *cpErr )
-           {
-             HLTError("Cannot convert output_percentage parameter '%s'", argv[i+1] );
-             return EINVAL;
-           }
-         HLTInfo("Output percentage set to %lu %%", fOutputPercentage );
-         i += 2;
-         continue;
-       }
-      else if ( strcmp( argv[i], "-cdb" ) == 0)
-       {
-         if ( i+1 >= argc )
-           {
-             HLTError("Missing -cdb argument");
-             return ENOTSUP;         
-           }
-         fStrorageDBpath = argv[i+1];
-         HLTInfo("DB storage is %s", fStrorageDBpath.c_str() );          
-         i += 2;
-         continue;
-       }  
-      else if ( strcmp( argv[i], "-useHLTTracks" ) == 0){
-       fUseHLTTracks = kTRUE;
-       i++;
-       HLTInfo("Expecting block of AliHLTTracks as input. Using low-level interface");
-      }
-      else{
-       HLTError("Unknown option '%s'", argv[i] );
-       return EINVAL;
+      if ( !strcmp( argv[i], "output_size" ) )
+        {
+          if ( i+1>=argc )
+            {
+              HLTError("Missing output_size parameter");
+              return ENOTSUP;
+            }
+          HLTDebug("argv[%d+1] == %s", i, argv[i+1] );
+          fOutputSize = strtoul( argv[i+1], &cpErr, 0 );
+          if ( *cpErr )
+            {
+              HLTError("Cannot convert output_size parameter '%s'", argv[i+1] );
+              return EINVAL;
+            }
+          HLTInfo("Output size set to %lu %%", fOutputSize );
+          i += 2;
+          continue;
+        }
+      if ( !strcmp( argv[i], "-minClusters" ) )
+        {
+          if ( i+1>=argc )
+            {
+              HLTError("Missing minClusters parameter");
+              return ENOTSUP;
+            }
+          HLTDebug("argv[%d+1] == %s", i, argv[i+1] );
+         fMinClusters = strtoul( argv[i+1], &cpErr, 0 );
+          i += 2;
+          continue;
+        }
+      if ( !strcmp( argv[i], "-minTracklets" ) )
+        {
+          if ( i+1>=argc )
+            {
+              HLTError("Missing minTracklets parameter");
+              return ENOTSUP;
+            }
+          HLTDebug("argv[%d+1] == %s", i, argv[i+1] );
+         fMinTracklets = strtoul( argv[i+1], &cpErr, 0 );
+          i += 2;
+          continue;
+        }
+      if ( !strcmp( argv[i], "-TrgStr" ) )
+        {
+          if ( i+1>=argc )
+            {
+              HLTError("Missing parameter for mbTriggerString");
+              return ENOTSUP;
+            }
+          HLTDebug("argv[%d+1] == %s", i, argv[i+1] );
+          fTrgStrings->Add(new TObjString(argv[i+1]));
+          i += 2;
+          continue;
+        }
+
+      if ( !strcmp( argv[i], "-acceptTrgStr" ) )
+        {
+          fAccRejTrg=1;
+          i += 1;
+          continue;
+        }
+      if ( !strcmp( argv[i], "-rejectTrgStr" ) )
+        {
+          fAccRejTrg=-1;
+          i += 1;
+          continue;
+        }
+      if ( !strcmp( argv[i], "-takeAllEvents" ) )
+        {
+         fTakeAllEvents = kTRUE;
+         fAccRejTrg = 0;
+          i += 1;
+          continue;
+        }
+
+      else {
+        HLTError("Unknown option '%s'", argv[i] );
+        return EINVAL;
       }
     }
-  return 0;
+  return i;
 }
 
 Int_t AliHLTTRDCalibrationComponent::InitCalibration()
 {
-  //init the calibration
-  fCDB = AliCDBManager::Instance();
-  if (!fCDB)
-    {
-      HLTError("Could not get CDB instance, fCDB 0x%x", fCDB);
-    }
-  else
-    {
-      fCDB->SetRun(0); // THIS HAS TO BE RETRIEVED !!!
-      fCDB->SetDefaultStorage(fStrorageDBpath.c_str());
-      HLTDebug("fCDB 0x%x", fCDB);
-    }
+
+  if(!fTrgStrings)
+    fTrgStrings = new TObjArray();
+
+  if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
+    HLTError("DefaultStorage is not set in CDBManager");
+    return -EINVAL;
+  }
+  if(AliCDBManager::Instance()->GetRun()<0){
+    HLTError("Run Number is not set in CDBManager");
+    return -EINVAL;
+  }
+  HLTInfo("CDB default storage: %s; RunNo: %i", (AliCDBManager::Instance()->GetDefaultStorage()->GetBaseFolder()).Data(), AliCDBManager::Instance()->GetRun());
+
+  if(fTrgStrings->GetEntriesFast()>0 && !fAccRejTrg){
+    HLTError("Trigger string(s) given, but acceptTrgStr or rejectTrgStr not selected");
+    return -EINVAL;
+  }
+
   fTRDCalibraFillHisto = AliTRDCalibraFillHisto::Instance();
+  fTRDCalibraFillHisto->SetIsHLT(kTRUE);
   fTRDCalibraFillHisto->SetHisto2d(); // choose to use histograms
   fTRDCalibraFillHisto->SetCH2dOn();  // choose to calibrate the gain
   fTRDCalibraFillHisto->SetPH2dOn();  // choose to calibrate the drift velocity
   fTRDCalibraFillHisto->SetPRF2dOn(); // choose to look at the PRF
-  fTRDCalibraFillHisto->Init2Dhistos(); // initialise the histos
+  fTRDCalibraFillHisto->SetIsHLT(); // per detector
+  //fTRDCalibraFillHisto->SetDebugLevel(1);// debug
+  fTRDCalibraFillHisto->SetFillWithZero(kTRUE);
+  fTRDCalibraFillHisto->SetLinearFitterOn(kTRUE);
+  fTRDCalibraFillHisto->SetNumberBinCharge(100);
+  
+  fTracksArray = new TClonesArray("AliTRDtrackV1");
+  fOutArray = new TObjArray(4);
+  fAfterRunArray=new TObjArray(5);
+  fDisplayArray=new TObjArray(4);
+
+  HLTDebug("run SetupCTPData");
+  SetupCTPData();
+
   return 0;
 }
 
 Int_t AliHLTTRDCalibrationComponent::DeinitCalibration()
 {
-  HLTDebug("DeinitCalibration");
   
   // Deinitialization of the component
-
-  if (fCDB)
-    {
-      HLTDebug("destroy fCDB");
-      fCDB->Destroy();
-      fCDB = 0;
-    }
+  
+  HLTDebug("DeinitCalibration");
+  delete fTracksArray; fTracksArray=0;
+  fTRDCalibraFillHisto->DestroyDebugStreamer();
+  //fTRDCalibraFillHisto->Destroy();
+  //fOutArray->Delete();
+  delete fOutArray; fOutArray=0;
+  fAfterRunArray->Delete();
+  delete fAfterRunArray; fAfterRunArray=0;
+  fDisplayArray->Delete();
+  delete fDisplayArray; fDisplayArray=0;
+  fTrgStrings->Delete();
+  delete fTrgStrings; fTrgStrings=0;
   return 0;
 }
 
-Int_t AliHLTTRDCalibrationComponent::ProcessCalibration(const AliHLTComponent_EventData& evtData,
-                                                       const AliHLTComponent_BlockData* blocks,
-                                                       AliHLTComponent_TriggerData& /*trigData*/,
-                                                       AliHLTUInt8_t* /*outputPtr*/,
-                                                       AliHLTUInt32_t& /*size*/,
-                                                       vector<AliHLTComponent_BlockData>& /*outputBlocks*/)
+Int_t AliHLTTRDCalibrationComponent::ProcessCalibration(const AliHLTComponent_EventData& /*evtData*/,
+                                                        const AliHLTComponent_BlockData* /*blocks*/,
+                                                        AliHLTComponent_TriggerData& /*trigData*/,
+                                                        AliHLTUInt8_t* /*outputPtr*/,
+                                                        AliHLTUInt32_t& /*size*/,
+                                                        vector<AliHLTComponent_BlockData>& /*outputBlocks*/)
 {
   // Process an event
-  //   Logging( kHLTLogInfo, "HLT::TRDCalibration::ProcessCalibration", "Output percentage set", "Output percentage set to %lu %%", fOutputPercentage );
-  HLTDebug("NofBlocks %lu", evtData.fBlockCnt );
-  // Process an event
+       
+  TClonesArray* TCAarray[18] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+  Int_t usedEntries = 0;
+  Int_t blockOrObject = 0;
+  Int_t nTimeBins = -1;
 
-  // Loop over all input blocks in the event
-  vector<AliHLTComponent_DataType> expectedDataTypes;
-  GetInputDataTypes(expectedDataTypes);
-  for ( unsigned long iBlock = 0; iBlock < evtData.fBlockCnt; iBlock++ )
+  for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock(AliHLTTRDDefinitions::fgkTracksDataType); pBlock; pBlock=GetNextInputBlock()) 
     {
-      const AliHLTComponentBlockData &block = blocks[iBlock];
-      AliHLTComponentDataType inputDataType = block.fDataType;
-      Bool_t correctDataType = kFALSE;
-      
-      for(UInt_t i = 0; i < expectedDataTypes.size(); i++)
-       if( expectedDataTypes.at(i) == inputDataType)
-         correctDataType = kTRUE;
-      if (!correctDataType)
-       {
-         HLTDebug( "Block # %i/%i; Event 0x%08LX (%Lu) Wrong received datatype: %s - Skipping",
-                   iBlock, evtData.fBlockCnt,
-                   evtData.fEventID, evtData.fEventID, 
-                   DataType2Text(inputDataType).c_str());
-         continue;
-       }
-      else 
-       HLTDebug("We get the right data type: Block # %i/%i; Event 0x%08LX (%Lu) Received datatype: %s",
-                   iBlock, evtData.fBlockCnt-1,
-                   evtData.fEventID, evtData.fEventID, 
-                   DataType2Text(inputDataType).c_str());
-
-      TClonesArray* tracksArray = NULL;
-      int ibForce = 0;
-      if (fUseHLTTracks)
-       {
-         tracksArray = new TClonesArray("AliTRDtrackV1");
-         HLTDebug("BLOCK fPtr 0x%x, fOffset %i, fSize %i, fSpec 0x%x, fDataType %s", block.fPtr, block.fOffset, block.fSize, block.fSpecification, DataType2Text(block.fDataType).c_str());
-         ReadTracks(tracksArray, block.fPtr, block.fSize);
-       }
-      else
-       {
-         TObject *objIn = NULL;
-         if (iBlock == 0)
-           objIn = (TObject *)GetFirstInputObject( AliHLTTRDDefinitions::fgkTRDSATracksDataType, "TClonesArray", ibForce);
-         else
-           objIn = (TObject *)GetNextInputObject( ibForce );
-         HLTDebug("1stBLOCK, Pointer = 0x%x", objIn);
-         if (objIn){
-           tracksArray = (TClonesArray* )objIn;
-         }
-       }
-
-      if (tracksArray)
-       {
-         Int_t nbEntries = tracksArray->GetEntries();
-         HLTDebug(" %i TRDtracks in tracksArray", nbEntries);
-         AliTRDtrackV1* trdTrack = 0x0;
-         for (Int_t i = 0; i < nbEntries; i++){
-           HLTDebug("%i/%i: ", i+1, nbEntries);
-           trdTrack = (AliTRDtrackV1*)tracksArray->At(i);
-           trdTrack->Print();
-           fTRDCalibraFillHisto->UpdateHistogramsV1(trdTrack);
-         }
-       }
-      
-
-      TObjArray *outArray = FormOutput();
-      if (outArray){
-       PushBack(outArray, AliHLTTRDDefinitions::fgkCalibrationDataType);
-       delete outArray;
-      }
-      
-    }
-  return 0;
-  
-}
+      TCAarray[0] = fTracksArray;
+      AliHLTTRDUtils::ReadTracks(TCAarray[0], pBlock->fPtr, pBlock->fSize, &nTimeBins);
+      usedEntries = 1;
+      blockOrObject = -1;
+    }  
 
-/**
- * Read track to the TClonesArray from the memory 
- */
-//============================================================================
-Int_t AliHLTTRDCalibrationComponent::ReadTracks(TClonesArray *outArray, void* inputPtr, AliHLTUInt32_t size)
-{
-  AliHLTUInt8_t* iterPtr = (AliHLTUInt8_t* )inputPtr;
-  
-  cout << "\nReading tracks from the Memory\n ============= \n";
-  AliHLTTRDTrack * hltTrack;
-  AliHLTUInt32_t trackSize = 0, curSize = 0;
-  Int_t counter=0;
-  
-  while (curSize < size)
+  for(const TObject *iter = GetFirstInputObject(AliHLTTRDDefinitions::fgkHiLvlTracksDataType); iter; iter = GetNextInputObject()) 
     {
-      hltTrack = (AliHLTTRDTrack*) iterPtr;
-      HLTDebug("curSize %i, size %i",curSize, size);
-      
-      trackSize = hltTrack->GetSize();
-      HLTDebug("GetSize() %i", trackSize);
-
-      hltTrack->ReadTrackletsFromMemory(iterPtr + sizeof(AliHLTTRDTrack));
-
-      AliTRDtrackV1* curTRDTrack = new((*outArray)[counter]) AliTRDtrackV1();
-      hltTrack->ExportTRDTrack(curTRDTrack);
-      
-      curSize += trackSize; 
-      iterPtr += trackSize;
-      counter++;
+      if(blockOrObject<0){
+       HLTError("You may not mix high level and low level!");
+       return -1;
+      }
+
+      TCAarray[usedEntries] = dynamic_cast<TClonesArray*>(const_cast<TObject*>(iter));
+      if(!TCAarray[usedEntries])continue;
+      TObjString* strg = dynamic_cast<TObjString*>(const_cast<TObject*>(GetNextInputObject()));
+      if(!strg)continue;
+
+      nTimeBins = strg->String().Atoi();
+      usedEntries++;
+      blockOrObject = 1;
     }
 
-  //CheckTrackArray(outArray);
-  return counter;
-}
+  if(!blockOrObject)
+    return 0;
 
+  if(!fSavedTimeBins){
+    if(nTimeBins<0){
+      HLTFatal("Number of timebins is negative!");
+      return -1;
+    }
+    HLTDebug("Saving number of time bins which was read from input block. Value is: %d", nTimeBins);
+    fTRDCalibraFillHisto->Init2Dhistos(nTimeBins); // initialise the histos
+    fTRDCalibraFillHisto->SetNumberClusters(fMinClusters); // At least fMinClusters clusters
+    fTRDCalibraFillHisto->SetNumberClustersf(nTimeBins); // Not more than %d  clusters
+    fSavedTimeBins=kTRUE;
+  }
 
-Int_t AliHLTTRDCalibrationComponent::ShipDataToFXS( const AliHLTComponentEventData& /*evtData*/, AliHLTComponentTriggerData& /*trigData*/)
-{
-//   //Int_t PushToFXS(TObject* pObject, const char* pDetector, const char* pFileID, const char* pDDLNumber = "");
-//   //ireturn = PushToFXS(object, "TRD ", "TRDCalib", "1024 ");
+  Bool_t TriggerPassed = fTakeAllEvents;
 
-  TObjArray *outArray = FormOutput();
-  HLTDebug("Shipping data. Dummy. outputArray: pointer = 0x%x; NEntries = %i;", outArray, outArray->GetEntries());
-  Int_t ireturn = PushToFXS(outArray, "TRD ", "TRDCalib");
-  
-  if (outArray){
-    outArray->Delete();
-    delete outArray;
+  if(fAccRejTrg){
+    if(fAccRejTrg>0){
+      TriggerPassed=kFALSE;
+      for(int i = 0; i < fTrgStrings->GetEntriesFast(); i++){
+       const TObjString *const obString=(TObjString*)fTrgStrings->At(i);
+       const TString tString=obString->GetString();
+       if(CheckCTPTrigger(tString.Data())>0){TriggerPassed=kTRUE; break;}
+      }
+    }
+    else{
+      TriggerPassed=kTRUE;
+      for(int i = 0; i < fTrgStrings->GetEntriesFast(); i++){
+       const TObjString *const obString=(TObjString*)fTrgStrings->At(i);
+       const TString tString=obString->GetString();
+       if(CheckCTPTrigger(tString.Data())>0){TriggerPassed=kFALSE; break;}
+      }
+    }
   }
   
-  return ireturn;
-}
+  fTRDCalibraFillHisto->SetCH2dOn(TriggerPassed);
+  fTRDCalibraFillHisto->SetPH2dOn(TriggerPassed);
+  for(int i=0; i<usedEntries; i++){
+    const TClonesArray* inArr = TCAarray[i];
+    Int_t nbEntries = inArr->GetEntries();
+    HLTDebug(" %i TRDtracks in tracksArray", nbEntries);
+    AliTRDtrackV1* trdTrack = 0x0;
+    for (Int_t ii = 0; ii < nbEntries; ii++){
+      HLTDebug("%i/%i: ", ii+1, nbEntries);
+      trdTrack = (AliTRDtrackV1*)inArr->At(ii);
+      if(trdTrack->GetNumberOfTracklets()<fMinTracklets)continue;
+      fTRDCalibraFillHisto->UpdateHistogramsV1(trdTrack);
+      // for(int i3=0; i3<7; i3++)
+      //   if(trdTrack->GetTracklet(i3))trdTrack->GetTracklet(i3)->Bootstrap(fReconstructor);
+    }
+  }
+
+  if(!fOutArray->At(0))FormOutput(0);
+  if(!fDisplayArray->At(0))FormOutput(1);
+  PushBack(fDisplayArray, AliHLTTRDDefinitions::fgkCalibrationDataType);
 
+  if(blockOrObject<0){
+    TCAarray[0]->Delete();
+  }
+
+  return 0;
+
+}
 
 /**
- * Form output array of histrograms 
+ * Form output array of histrograms
  */
 //============================================================================
-TObjArray* AliHLTTRDCalibrationComponent::FormOutput()
+void AliHLTTRDCalibrationComponent::FormOutput(Int_t param)
 {
-  TObjArray *outArray=new TObjArray(3);
-
   // gain histo
   TH2I *hCH2d = fTRDCalibraFillHisto->GetCH2d();
-  outArray->Add(hCH2d);
+  if(!param)fOutArray->Add(hCH2d);
+  else fDisplayArray->Add(hCH2d);
 
   // drift velocity histo
   TProfile2D *hPH2d = fTRDCalibraFillHisto->GetPH2d();
-  outArray->Add(hPH2d);
-       
+  if(!param)fOutArray->Add(hPH2d);
+  else fDisplayArray->Add(hPH2d);
+
   // PRF histo
-  TProfile2D *hPRF2d = fTRDCalibraFillHisto->GetPRF2d(); 
-  outArray->Add(hPRF2d);
+  TProfile2D *hPRF2d = fTRDCalibraFillHisto->GetPRF2d();
+  if(!param)fOutArray->Add(hPRF2d);
+  else fDisplayArray->Add(hPRF2d);
+
+  // Vdrift Linear Fit
+  if(!param){
+    AliTRDCalibraVdriftLinearFit *hVdriftLinearFitOne=(AliTRDCalibraVdriftLinearFit *)fTRDCalibraFillHisto->GetVdriftLinearFit();
+    fOutArray->Add(hVdriftLinearFitOne);
+  }
+  else{
+    TH2S *hVdriftLinearFitOne = (TH2S *)(((AliTRDCalibraVdriftLinearFit *)fTRDCalibraFillHisto->GetVdriftLinearFit())->GetLinearFitterHisto(10,kTRUE));        
+    fDisplayArray->Add(hVdriftLinearFitOne);
+  }
 
-  HLTDebug("GetCH2d = 0x%x; NEntries = %i; size = %i", hCH2d, hCH2d->GetEntries(), sizeof(hCH2d));
+  HLTDebug("GetCH2d = 0x%x; NEntries = %i; size = %i", hCH2d, hCH2d->GetEntries(), sizeof(*hCH2d));
   hCH2d->Print();
-  HLTDebug("GetPH2d = 0x%x; NEntries = %i; size = %i", hPH2d, hPH2d->GetEntries(), sizeof(hPH2d));
+  HLTDebug("GetPH2d = 0x%x; NEntries = %i; size = %i", hPH2d, hPH2d->GetEntries(), sizeof(*hPH2d));
   hPH2d->Print();
-  HLTDebug("GetPRF2d = 0x%x; NEntries = %i; size = %i", hPRF2d, hPRF2d->GetEntries(), sizeof(hPRF2d));
+  HLTDebug("GetPRF2d = 0x%x; NEntries = %i; size = %i", hPRF2d, hPRF2d->GetEntries(), sizeof(*hPRF2d));
   hPRF2d->Print();
-  HLTDebug("output Array: pointer = 0x%x; NEntries = %i; size = %i", outArray, outArray->GetEntries(), sizeof(outArray));
-    
-  
+  //HLTDebug("GetVdriftLinearFit = 0x%x; size = %i", hVdriftLinearFitOne, sizeof(hVdriftLinearFitOne)); 
   
-  return outArray;
+  HLTDebug("output Array: pointer = 0x%x; NEntries = %i; size = %i", fOutArray, fOutArray->GetEntries(), sizeof(fOutArray));
+   
+}
+
+Int_t AliHLTTRDCalibrationComponent::ShipDataToFXS(const AliHLTComponentEventData& /*evtData*/, AliHLTComponentTriggerData& /*trigData*/)
+{
+  AliHLTReadoutList rdList(AliHLTReadoutList::kTRD);
+
+  EORCalibration();
   
+  fOutArray->Remove(fOutArray->FindObject("AliTRDCalibraVdriftLinearFit"));
+  //fOutArray->Remove(fOutArray->FindObject("PRF2d"));
+  //fOutArray->Remove(fOutArray->FindObject("PH2d"));
+  //fOutArray->Remove(fOutArray->FindObject("CH2d"));
+
+  if(!(fOutArray->FindObject("CH2d"))) {
+    TH2I * ch2d = new TH2I("CH2d","Nz0Nrphi0",100,0.0,300.0,540,0,540);
+    fOutArray->Add(ch2d);
+  }
+
+  if(!(fOutArray->FindObject("PH2d"))) {
+    TProfile2D * ph2d = new TProfile2D("PH2d","Nz0Nrphi0",30,-0.05,2.95,540,0,540);
+    fOutArray->Add(ph2d);
+  }
+
+  if(!(fOutArray->FindObject("PRF2d"))) {
+    TProfile2D * prf2d = new TProfile2D("PRF2d","Nz0Nrphi0Ngp3",60,-9.0,9.0,540,0,540);
+    fOutArray->Add(prf2d);
+  }
+
+  HLTDebug("Size of the fOutArray is %d\n",fOutArray->GetEntriesFast());
+
+  PushToFXS((TObject*)fOutArray, "TRD", "GAINDRIFTPRF", &rdList );
+  //PushToFXS((TObject*)fOutArray->FindObject("CH2d"), "TRD", "GAINDRIFTPRF", rdList.Buffer() );
+
+  return 0;
 }
 
+Int_t AliHLTTRDCalibrationComponent::EORCalibration()
+{
+  //Also Fill histograms for the online display
+  TH2I *hCH2d=(TH2I*)fOutArray->FindObject("CH2d");
+  TProfile2D *hPH2d=(TProfile2D*)fOutArray->FindObject("PH2d");
+  TProfile2D *hPRF2d= (TProfile2D*)fOutArray->FindObject("PRF2d");
+  AliTRDCalibraVdriftLinearFit* hVdriftLinearFit = (AliTRDCalibraVdriftLinearFit*)fOutArray->FindObject("AliTRDCalibraVdriftLinearFit");
+
+  if(!hCH2d || !hPH2d || !hPRF2d || !hVdriftLinearFit) return 0; 
+
+  //Fit
+  AliTRDCalibraFit *calibra = AliTRDCalibraFit::Instance();
+
+  //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();
+  TH1F *coefgain = 0x0;
+  // enough statistics
+  //if ((nbtg >                  0) && 
+  //   (nbfit        >= 0.2*nbE)) {
+  // create the cal objects
+  //calibra->PutMeanValueOtherVectorFit(1,kTRUE);
+  TObjArray object           = calibra->GetVectorFit();
+  AliTRDCalDet *objgaindet   = calibra->CreateDetObjectGain(&object,kFALSE);
+  coefgain                   = objgaindet->MakeHisto1DAsFunctionOfDet();
+  //}
+  calibra->ResetVectorFit();
+
+  // vdrift second method
+  calibra->SetMinEntries(100); // If there is less than 100
+  hVdriftLinearFit->FillPEArray();
+  calibra->AnalyseLinearFitters(hVdriftLinearFit);
+  //nbtg = 540;
+  //nbfit = calibra->GetNumberFit();
+  //nbE   = calibra->GetNumberEnt();
+  TH1F *coefdriftsecond = 0x0;
+  // enough statistics
+  //if ((nbtg >                  0) && 
+  // (nbfit        >= 0.1*nbE)) {
+  // create the cal objects
+  //calibra->PutMeanValueOtherVectorFit(1,kTRUE);
+  object  = calibra->GetVectorFit();
+  AliTRDCalDet *objdriftvelocitydetsecond = calibra->CreateDetObjectVdrift(&object,kTRUE);
+  objdriftvelocitydetsecond->SetTitle("secondmethodvdrift");
+  coefdriftsecond  = objdriftvelocitydetsecond->MakeHisto1DAsFunctionOfDet();
+  //}
+  calibra->ResetVectorFit();
+  
+  // 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();
+  TH1F *coefdrift = 0x0;
+  TH1F *coeft0 = 0x0;
+  // enough statistics
+  //if ((nbtg >                  0) && 
+  // (nbfit        >= 0.2*nbE)) {
+  // create the cal objects
+  //calibra->PutMeanValueOtherVectorFit(1,kTRUE);
+  //calibra->PutMeanValueOtherVectorFit2(1,kTRUE);
+  object  = calibra->GetVectorFit();
+  AliTRDCalDet *objdriftvelocitydet = calibra->CreateDetObjectVdrift(&object,kTRUE);
+  coefdrift        = objdriftvelocitydet->MakeHisto1DAsFunctionOfDet();
+  object              = calibra->GetVectorFit2();
+  AliTRDCalDet *objtime0det  = calibra->CreateDetObjectT0(&object,kTRUE);
+  coeft0        = objtime0det->MakeHisto1DAsFunctionOfDet();
+  //}
+  calibra->ResetVectorFit();
+           
+
+  //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();
+  TH1F *coefprf = 0x0;
+  // enough statistics
+  //if ((nbtg >                  0) && 
+  //  (nbfit        >= 0.95*nbE)) {
+  // create cal pad objects 
+  object            = calibra->GetVectorFit();
+  TObject *objPRFpad          = calibra->CreatePadObjectPRF(&object);
+  coefprf                     = ((AliTRDCalPad *) objPRFpad)->MakeHisto1D();
+  //}
+  calibra->ResetVectorFit();
+
+
+  coefgain->SetName("coefgain");
+  coefprf->SetName("coefprf");
+  coefdrift->SetName("coefdrift");
+  coefdriftsecond->SetName("coefdriftsecond");
+  coeft0->SetName("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);
+  }
+
+  // TString fileName="/tmp/CalibHistoDump_run";
+  // fileName+=AliCDBManager::Instance()->GetRun();
+  // fileName+=".root";
+  // HLTInfo("Dumping Histogram file to %s",fileName.Data());
+  // TFile* file = TFile::Open(fileName, "RECREATE");
+  // fAfterRunArray->Write();
+  // fOutArray->Write();
+  // file->Close();
+  // HLTInfo("Histogram file dumped");
+
+  return 0;
+}      
+