remove option to pushback every n events (Theodor)
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 7 Nov 2009 22:44:43 +0000 (22:44 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 7 Nov 2009 22:44:43 +0000 (22:44 +0000)
HLT/TRD/AliHLTTRDCalibrationComponent.cxx
HLT/TRD/AliHLTTRDCalibrationComponent.h
HLT/TRD/AliHLTTRDClusterHistoComponent.cxx
HLT/TRD/AliHLTTRDClusterHistoComponent.h

index fabc751..7c45a72 100644 (file)
@@ -67,8 +67,6 @@ AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent()
     fOutArray(NULL),
     fAfterRunArray(NULL),
     fDisplayArray(NULL),
-    fNevent(0),
-    feveryNevent(1000),
     fRecievedTimeBins(kFALSE),
     fTrgStrings(NULL),
     fAccRejTrg(0)
@@ -161,13 +159,7 @@ Int_t AliHLTTRDCalibrationComponent::ScanArgument( int argc, const char** argv )
               return ENOTSUP;
             }
           HLTDebug("argv[%d+1] == %s", i, argv[i+1] );
-          fOutputSize = strtoul( argv[i+1], &cpErr, 0 );
-          if ( *cpErr )
-            {
-              HLTError("Cannot convert everyNevent parameter '%s'", argv[i+1] );
-              return EINVAL;
-            }
-          HLTInfo("Pushing back every %d event", feveryNevent);
+          HLTInfo("Option -everyNevent depreceated");
           i += 2;
           continue;
         }
@@ -357,13 +349,10 @@ Int_t AliHLTTRDCalibrationComponent::ProcessCalibration(const AliHLTComponent_Ev
 
       if(!fOutArray->At(0))FormOutput(0);
       if(!fDisplayArray->At(0))FormOutput(1);
-      if (fNevent%feveryNevent==0 && fOutArray) {
-       PushBack(fDisplayArray, AliHLTTRDDefinitions::fgkCalibrationDataType);
-      }
-
+      PushBack(fDisplayArray, AliHLTTRDDefinitions::fgkCalibrationDataType);
+      
       fTracksArray->Delete();
-      fNevent++;
-
+      
     }
  
   return 0;
index 55f792c..3de27bf 100644 (file)
@@ -85,13 +85,11 @@ private:
   TObjArray* fOutArray;          // array containing the output
   TObjArray* fAfterRunArray;     // array with after run processing output 
   TObjArray* fDisplayArray;        //array with online display histos
-  UInt_t fNevent;                 // number of processed events
-  UInt_t feveryNevent;            // push back every nth event
   Bool_t fRecievedTimeBins;      // already recived the number of time bins?
   TObjArray *fTrgStrings;        // name of trigger classes to accept or reject
   Int_t  fAccRejTrg;             // do we actually accept or reject the trigger strings?
   
-  ClassDef(AliHLTTRDCalibrationComponent, 1)
+  ClassDef(AliHLTTRDCalibrationComponent, 2)
 
 };
 #endif
index 103e138..da4dd8b 100644 (file)
@@ -50,8 +50,6 @@ AliHLTTRDClusterHistoComponent::AliHLTTRDClusterHistoComponent()
 : AliHLTProcessor(),
   fOutputSize(100000),
   fClusterArray(NULL),
-  fNevent(0),
-  feveryNevent(20),
   fNClsDet(NULL),
   fClsAmp(NULL),
   fClsAmpDrift(NULL),
@@ -268,19 +266,16 @@ int AliHLTTRDClusterHistoComponent::DoEvent(const AliHLTComponentEventData& /*ev
 
   fNScls->Fill(nSClusters);
 
-  if(fNevent%feveryNevent==0){
-    PushBack((TObject*)fNClsDet, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);   
-    PushBack((TObject*)fClsAmp, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
-    //  PushBack((TObject*)fClsAmpDrift, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);   
-    //  PushBack((TObject*)fClsTB, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
-    //  PushBack((TObject*)fClsAmpDist, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
-    PushBack((TObject*)fNScls, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
-    PushBack((TObject*)fSClsDist, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
-    PushBack((TObject*)fClusterDist, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);
-    PushBack((TObject*)fClusterCandCharge, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);
-  }
-  
-  fNevent++;
+  PushBack((TObject*)fNClsDet, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);   
+  PushBack((TObject*)fClsAmp, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
+  //  PushBack((TObject*)fClsAmpDrift, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);   
+  //  PushBack((TObject*)fClsTB, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
+  //  PushBack((TObject*)fClsAmpDist, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
+  PushBack((TObject*)fNScls, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
+  PushBack((TObject*)fSClsDist, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);  
+  PushBack((TObject*)fClusterDist, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);
+  PushBack((TObject*)fClusterCandCharge, kAliHLTDataTypeHistogram | kAliHLTDataOriginTRD, 0);
+
   return 0;
 }
 
@@ -306,8 +301,7 @@ int AliHLTTRDClusterHistoComponent::Configure(const char* arguments){
       } 
       if (argument.CompareTo("-everyNevent")==0) {
        if ((bMissingParam=(++i>=pTokens->GetEntries()))) break;
-       HLTInfo("Pushing back every %s event.", ((TObjString*)pTokens->At(i))->GetString().Data());
-       feveryNevent=((TObjString*)pTokens->At(i))->GetString().Atoi();
+       HLTInfo("Option -everyNevent depreceated");
        continue;
       } 
       else {
index 66bdf06..39b3764 100644 (file)
@@ -80,8 +80,6 @@ private:
 
   AliHLTUInt32_t fOutputSize;   // output size
   TClonesArray* fClusterArray;  // input array
-  UInt_t fNevent;               // number of processed events
-  UInt_t feveryNevent;          // push back every nth event
 
   TH1D *fNClsDet;
   TH1D *fClsAmp;