move string replacing from multiple macros to GetTriggerBCMaskAndMu.C

alisw · Jun 22, 2020 · a1c92c9 · a1c92c9
1 parent bf80625
commit a1c92c9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 34 deletions.
diff --git a/MC/CustomGenerators/DPG/Dpmjet_Pileup_Cent.C b/MC/CustomGenerators/DPG/Dpmjet_Pileup_Cent.C
@@ -14,14 +14,9 @@ AliGenerator *GeneratorCustom(){
   Double_t mu=0.001; 
   TString bcm=GetTriggerBCMaskAndMu(mu);
 
-  // swap H and L to match requirement of AliGenPileup
-  bcm.ReplaceAll("H","X");
-  bcm.ReplaceAll("L","H");
-  bcm.ReplaceAll("X","L");
-
   //printf("   BC mask = %s\n",bcm.Data());
-  printf("   mu = %f\n",mu);
-  printf("   Energy = %f\n",energyConfig);
+  //printf("   mu = %f\n",mu);
+  //printf("   Energy = %f\n",energyConfig);
 
   // Set the pileup interaction generator
   // The second argument is the pileup rate

diff --git a/MC/CustomGenerators/DPG/EPOS_Pileup_Cent.C b/MC/CustomGenerators/DPG/EPOS_Pileup_Cent.C
@@ -14,14 +14,9 @@ AliGenerator *GeneratorCustom(){
   Double_t mu=0.001; 
   TString bcm=GetTriggerBCMaskAndMu(mu);
 
-  // swap H and L to match requirement of AliGenPileup
-  bcm.ReplaceAll("H","X");
-  bcm.ReplaceAll("L","H");
-  bcm.ReplaceAll("X","L");
-
   //printf("   BC mask = %s\n",bcm.Data());
-  printf("   mu = %f\n",mu);
-  printf("   Energy = %f\n",energyConfig);
+  //printf("   mu = %f\n",mu);
+  //printf("   Energy = %f\n",energyConfig);
 
   // Set the pileup interaction generator
   // The second argument is the pileup rate

diff --git a/MC/CustomGenerators/DPG/Hijing_Pileup.C b/MC/CustomGenerators/DPG/Hijing_Pileup.C
@@ -14,14 +14,9 @@ AliGenerator *GeneratorCustom(){
   Double_t mu=0.001; 
   TString bcm=GetTriggerBCMaskAndMu(mu);
 
-  // swap H and L to match requirement of AliGenPileup
-  bcm.ReplaceAll("H","X");
-  bcm.ReplaceAll("L","H");
-  bcm.ReplaceAll("X","L");
-
   //printf("   BC mask = %s\n",bcm.Data());
-  printf("   mu = %f\n",mu);
-  printf("   Energy = %f\n",energyConfig);
+  //printf("   mu = %f\n",mu);
+  //printf("   Energy = %f\n",energyConfig);
 
   // Set the pileup interaction generator
   // The second argument is the pileup rate

diff --git a/MC/CustomGenerators/DPG/Hijing_Pileup_Cent.C b/MC/CustomGenerators/DPG/Hijing_Pileup_Cent.C
@@ -13,15 +13,10 @@ AliGenerator *GeneratorCustom(){
 
   Double_t mu=0.001; 
   TString bcm=GetTriggerBCMaskAndMu(mu);
-
-  // swap H and L to match requirement of AliGenPileup
-  bcm.ReplaceAll("H","X");
-  bcm.ReplaceAll("L","H");
-  bcm.ReplaceAll("X","L");
 
   //printf("   BC mask = %s\n",bcm.Data());
-  printf("   mu = %f\n",mu);
-  printf("   Energy = %f\n",energyConfig);
+  //printf("   mu = %f\n",mu);
+  //printf("   Energy = %f\n",energyConfig);
 
   // Set the pileup interaction generator
   // The second argument is the pileup rate

diff --git a/MC/CustomGenerators/DPG/PerformanceGenerator_Pileup.C b/MC/CustomGenerators/DPG/PerformanceGenerator_Pileup.C
@@ -17,13 +17,9 @@ AliGenerator * GeneratorCustom() {
   Double_t mu=0.001; 
   TString bcm=GetTriggerBCMaskAndMu(mu);
 
-  // swap H and L to match requirement of AliGenPileup
-  bcm.ReplaceAll("H","X");
-  bcm.ReplaceAll("L","H");
-  bcm.ReplaceAll("X","L");
   //printf("   BC mask = %s\n",bcm.Data());
-  printf("   mu = %f\n",mu);
-  printf("   Energy = %f\n",energyConfig);
+  //printf("   mu = %f\n",mu);
+  //printf("   Energy = %f\n",energyConfig);
 
   // Set the pileup interaction generator
   // The second argument is the pileup rate

diff --git a/Utils/GetTriggerBCMaskAndMu.C b/Utils/GetTriggerBCMaskAndMu.C
@@ -49,6 +49,11 @@ TString GetTriggerBCMaskAndMu( double& mu, int run = -1 )
 
   TString maskStr = mask->GetTitle();
 
+  // swap H and L to match requirement of AliGenPileup
+  maskStr.ReplaceAll("H","X");
+  maskStr.ReplaceAll("L","H");
+  maskStr.ReplaceAll("X","L");
+
   printf("GetTriggerBCMaskAndMu() -- mask %s\n",maskStr.Data());
 
   //