TRD online reco update (Theodor)
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 2 Nov 2009 23:00:26 +0000 (23:00 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 2 Nov 2009 23:00:26 +0000 (23:00 +0000)
- ClusterizerComponent: add tailcancellation as separate config option
- TrackerV1Component: remove number of timebins as conig option
- update OCDB entries (enable tailcancellation and remove timebins)

HLT/TRD/AliHLTTRDClusterizerComponent.cxx
HLT/TRD/AliHLTTRDClusterizerComponent.h
HLT/TRD/AliHLTTRDTrackerV1Component.cxx
OCDB/HLT/ConfigTRD/ClusterizerComponent/Run0_999999999_v0_s1.root [new file with mode: 0644]
OCDB/HLT/ConfigTRD/TrackerV1Component/Run0_999999999_v0_s1.root [new file with mode: 0644]

index d25f283..3a09238 100644 (file)
@@ -82,7 +82,8 @@ AliHLTTRDClusterizerComponent::AliHLTTRDClusterizerComponent()
   fyPosMethod(1),
   fgeometryFileName(""),
   fProcessTracklets(kFALSE),
-  fHLTstreamer(kTRUE)
+  fHLTstreamer(kTRUE),
+  fTC(kFALSE)
 {
   // Default constructor
 
@@ -433,6 +434,11 @@ int AliHLTTRDClusterizerComponent::Configure(const char* arguments){
        HLTInfo("Don't use fast raw streamer");
        continue;
       }
+      else if (argument.CompareTo("-tailcancellation")==0) {
+       fTC = kTRUE;
+       HLTInfo("Useing tailcancellation");
+       continue;
+      }
       else if (argument.CompareTo("-rawver")==0) {
        if ((bMissingParam=(++i>=pTokens->GetEntries()))) break;
        HLTInfo("Raw data version is: %s", ((TObjString*)pTokens->At(i))->GetString().Data());
@@ -545,10 +551,9 @@ int AliHLTTRDClusterizerComponent::SetParams()
 #   define AliTRDRecoParamSetLUT(b) fRecoParam->SetLUT()
 # endif
 
-  switch(fRecoDataType){
-  case 0: AliTRDRecoParamSetTailCancelation(kTRUE); HLTDebug("Enableing Tail Cancelation"); break;
-  case 1: AliTRDRecoParamSetTailCancelation(kFALSE); HLTDebug("Enableing Tail Cancelation"); break;
-  }
+  if(fTC){AliTRDRecoParamSetTailCancelation(kTRUE); HLTDebug("Enableing Tail Cancelation"); }
+  else{AliTRDRecoParamSetTailCancelation(kFALSE); HLTDebug("Enableing Tail Cancelation"); }
+
   switch(fyPosMethod){
   case 0: AliTRDRecoParamSetGAUS(kFALSE); AliTRDRecoParamSetLUT(kFALSE); break;
   case 1: AliTRDRecoParamSetGAUS(kFALSE); AliTRDRecoParamSetLUT(kTRUE); break;
index 4f4295f..803cfcd 100644 (file)
@@ -89,8 +89,9 @@ private:
   TString fgeometryFileName;
   Bool_t fProcessTracklets; // write the L! tracklets to output
   Bool_t fHLTstreamer;      // use FastStreamer
+  Bool_t fTC;               // using tail cancellation
 
-  ClassDef(AliHLTTRDClusterizerComponent, 3)
+  ClassDef(AliHLTTRDClusterizerComponent, 4)
 
 };
 #endif
index 0f1bc62..b1f991a 100644 (file)
@@ -248,7 +248,7 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData& evtDat
 #endif      
 
       AliHLTTRDUtils::ReadClusters(fClusterArray, block.fPtr, block.fSize, &fNtimeBins);
-      HLTDebug("Reading number of time bins from input block. Changing number of timebins to %d", fNtimeBins);
+      HLTDebug("Reading number of time bins from input block. Setting number of timebins to %d", fNtimeBins);
       AliTRDtrackerV1::SetNTimeBins(fNtimeBins);
 
       HLTDebug("TClonesArray of clusters: nbEntries = %i", fClusterArray->GetEntriesFast());
@@ -347,8 +347,7 @@ int AliHLTTRDTrackerV1Component::Configure(const char* arguments){
       } 
       else if (argument.CompareTo("-NTimeBins")==0) {
        if ((bMissingParam=(++i>=pTokens->GetEntries()))) break;
-       HLTInfo("Setting number of time bins to: %s", ((TObjString*)pTokens->At(i))->GetString().Data());
-       fNtimeBins=((TObjString*)pTokens->At(i))->GetString().Atoi();
+       HLTInfo("Option depreceated");
        continue;
       } 
       else if (argument.CompareTo("-geometry")==0) {
@@ -475,22 +474,6 @@ int AliHLTTRDTrackerV1Component::SetParams()
   else{
     HLTInfo("Geometry Already Loaded!");
   }
-
-  if (fNtimeBins <= 0)
-    {
-      HLTError("Sorry. Tracker needs number of time bins. At the moment you have to provide it with -NTimeBins <value>. The simulation always had 24 and the real data 30. Take your pick. Make sure the information is correct. Ask offline to implement how to propagate this information into clusters/cluster tree.");
-      return -EINVAL;
-    }
-  if (fNtimeBins < 24 || fNtimeBins > 30)
-    {
-      HLTWarning("The number of time bins seems to be strange = %d. But okay. Let's try it...", fNtimeBins);
-    }
-  if (fNtimeBins != 24)
-    {
-      HLTWarning("All PID methods eagerly await 24 time bins, so PID will NOT work!", fNtimeBins);
-    }
-  HLTDebug("Setting number of time bins of the tracker to: %i", fNtimeBins);
-  AliTRDtrackerV1::SetNTimeBins(fNtimeBins);
   
   if (fRecoParamType == 0)
     {
@@ -553,7 +536,7 @@ int AliHLTTRDTrackerV1Component::SetParams()
       HLTDebug("Magnetic field is OFF.");
     }else{
       // magnetic field ON
-      field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
+      field = new AliMagF("Maps","Maps",-1.,-1.,AliMagF::k5kG);
       TGeoGlobalMagField::Instance()->SetField(field);
       HLTDebug("Magnetic field is ON.");
       if( fMagneticField < 0 )
diff --git a/OCDB/HLT/ConfigTRD/ClusterizerComponent/Run0_999999999_v0_s1.root b/OCDB/HLT/ConfigTRD/ClusterizerComponent/Run0_999999999_v0_s1.root
new file mode 100644 (file)
index 0000000..7453fd3
Binary files /dev/null and b/OCDB/HLT/ConfigTRD/ClusterizerComponent/Run0_999999999_v0_s1.root differ
diff --git a/OCDB/HLT/ConfigTRD/TrackerV1Component/Run0_999999999_v0_s1.root b/OCDB/HLT/ConfigTRD/TrackerV1Component/Run0_999999999_v0_s1.root
new file mode 100644 (file)
index 0000000..362d0c7
Binary files /dev/null and b/OCDB/HLT/ConfigTRD/TrackerV1Component/Run0_999999999_v0_s1.root differ