Coding violation fixies (Jens Viechula)

[u/mrichter/AliRoot.git] / macros / AliMergeSteer.C

diff --git a/macros/AliMergeSteer.C b/macros/AliMergeSteer.C
index 1109c59aa7e03971f64abb46823bd41bad9fc7d3..9fa3b32682d6c78551bfc0a74b5b745836863217 100644 (file)
--- a/macros/AliMergeSteer.C
+++ b/macros/AliMergeSteer.C
@@ -136,8 +136,8 @@ private:
   Int_t   fMUON;
   Int_t   fPHOS;
   Int_t   fPMD;
-  Int_t   fRICH;
-  Int_t   fSTART;
+  Int_t   fHMPID;
+  Int_t   fT0;
   Int_t   fTOF;
   Int_t   fTPC;
   Int_t   fTRD;
@@ -190,8 +190,8 @@ AliMergeSteer::AliMergeSteer(const Text_t *name, const Text_t* title) : TTask(na
   fMUON = 0;
   fPHOS = 0;
   fPMD = 0;
-  fRICH = 0;
-  fSTART = 0;
+  fHMPID = 0;
+  fT0 = 0;
   fTOF = 0;
   fTPC = 0;
   fTRD = 0;
@@ -262,10 +262,10 @@ Int_t AliMergeSteer::GetDetectorFlag(Option_t* option)
     return fPHOS;
   } else if (strstr(option,"PMD")) {
     return fPMD;
-  } else if (strstr(option,"RICH")) {
-    return fRICH;
-  } else if (strstr(option,"START")) {
-    return fSTART;
+  } else if (strstr(option,"HMPID")) {
+    return fHMPID;
+  } else if (strstr(option,"T0")) {
+    return fT0;
   } else if (strstr(option,"TOF")) {
     return fTOF;
   } else if (strstr(option,"TPC")) {
@@ -297,10 +297,10 @@ Bool_t AliMergeSteer::SetDetectorFlag(Option_t* option, Int_t flag)
     fPHOS = flag;
   } else if (strstr(option,"PMD")) {
     fPMD = flag;
-  } else if (strstr(option,"RICH")) {
-    fRICH = flag;
-  } else if (strstr(option,"START")) {
-    fSTART = flag;
+  } else if (strstr(option,"HMPID")) {
+    fHMPID = flag;
+  } else if (strstr(option,"T0")) {
+    fT0 = flag;
   } else if (strstr(option,"TOF")) {
     fTOF = flag;
   } else if (strstr(option,"TPC")) {
@@ -447,7 +447,7 @@ Bool_t AliMergeSteer::Merge()
          "Merge(\"%s\",\"%s\",\"%s\",%d,%d,%d,%d,%d,%d,%d,%d);",
          fFileNameDigitsMerged.Data(),fFileNameSDigits.Data(),
          fFileNameBgrSDigits.Data(),
-         fNEvents,fITS,fTPC,fTRD,fPHOS,fMUON,fRICH,0);
+         fNEvents,fITS,fTPC,fTRD,fPHOS,fMUON,fHMPID,0);
   cerr<<"I'll do: "<<funcName<<endl;
   gROOT->LoadMacro(macroName);
   if (fDEBUG) cerr<<"I'll do: "<<funcName<<endl;
@@ -470,7 +470,7 @@ Bool_t AliMergeSteer::NoMerge()
   sprintf(funcName,
          "AliSDigits2Digits(\"%s\",\"%s\",%d,%d,%d,%d,%d,%d,%d,%d);",
          fFileNameDigitsSignalOnly.Data(),fFileNameSDigits.Data(),
-         fNEvents,fITS,fTPC,fTRD,fPHOS,fMUON,fRICH,0);
+         fNEvents,fITS,fTPC,fTRD,fPHOS,fMUON,fHMPID,0);
   if (fDEBUG) cerr<<"I'll do: "<<funcName<<endl;
   gROOT->LoadMacro(macroName);
   gInterpreter->ProcessLine(funcName);