Merge branch 'main' into fst-tracking-mode

StRoot/StRefMultCorr/BadRun.h

@@ -91,25 +91,43 @@ const Int_t badrun_refmult_2019[nBadRun_refmult_2019] = {
 // 1. Au+Au 31.2 AGeV (3) = 7.7 GeV
 // 2. Au+Au 7.3 AGeV (4) = 3.9 GeV
 // 3. Au+Au 5.75 AGeV (8) = 3.5 GeV
+// 4. Au+Au 13.5 AGeV (2) = 5.2 GeV
+// 5. Au+Au 19.5 AGeV (2) = 6.2 GeV
+// 6. Au+Au 9.2 GeV (204)
+// 7. Au+Au 11.5 GeV (85)
 //
-const Int_t nBadRun_refmult_2020 = 15;
+const Int_t nBadRun_refmult_2020 = 308;
 const Int_t badrun_refmult_2020[nBadRun_refmult_2020] = {
   // Au+Au 31.2 AGeV (7.7 GeV)
   21029002, 21029013, 21029027,
   // Au+Au 7.3 AGeV (3.9 GeV)
   21035008, 21035011, 21036012, 21035014,
   // Au+Au 5.75 AGeV (3.5 GeV)
-  20355020, 20355021, 21044023, 21045024, 21045025, 21044027, 21044035, 21045004
+  20355020, 20355021, 21044023, 21045024, 21045025, 21044027, 21044035, 21045004,
+  // Au+Au 13.5 AGeV (5.2 GeV)
+  21034002, 21034007,
+  // Au+Au 19.5 AGeV (6.2 GeV)
+  21032046, 21033009,
+  // Au+Au 9.2 GeV
+  21036025, 21036028, 21036032, 21037025, 21037030, 21037031, 21037047, 21037052, 21038020, 21038021, 21038029, 21038031, 21038033, 21038035, 21038039, 21038042, 21038046, 21039025, 21039029, 21040007, 21056032, 21058027, 21058028, 21058029, 21058030, 21060015, 21060016, 21060021, 21060026, 21062015, 21062020, 21062021, 21064004, 21064024, 21064041, 21064047, 21065026, 21065042, 21066027, 21066028, 21067020, 21068024, 21068027, 21068030, 21069005, 21069006, 21069014, 21069017, 21069035, 21069038, 21069040, 21069042, 21069043, 21070011, 21071002, 21072016, 21073007, 21073008, 21073032, 21076004, 21076029, 21077024, 21078001, 21078002, 21078006, 21078020, 21080027, 21169035, 21169036, 21169037, 21169038, 21169039, 21170018, 21171007, 21171031, 21171032, 21171033, 21172032, 21174049, 21174050, 21175009, 21176020, 21176024, 21176029, 21177019, 21177020, 21177021, 21177022, 21177032, 21178013, 21179001, 21179018, 21179020, 21179026, 21180008, 21180025, 21180027, 21181024, 21181025, 21181026, 21181033, 21182037, 21182038, 21182041, 21184025, 21184026, 21186026, 21186027, 21187032, 21188017, 21188027, 21189039, 21189040, 21190053, 21191008, 21192018, 21193009, 21193027, 21194002, 21196004, 21197005, 21198002, 21203001, 21203002, 21203003, 21203017, 21205002, 21205020, 21205023, 21206002, 21206005, 21206007, 21206008, 21208027, 21209009, 21210009, 21210046, 21211004, 21211009, 21213004, 21213005, 21213006, 21213013, 21213014, 21213016, 21213017, 21213018, 21213019, 21213020, 21217001, 21217010, 21217020, 21218001, 21218002, 21218003, 21218004, 21218005, 21218006, 21218007, 21218013, 21218014, 21218015, 21218016, 21218017, 21219007, 21219008, 21219009, 21219010, 21220015, 21222026, 21223030, 21225035, 21225040, 21225041, 21225042, 21225045, 21226003, 21227007, 21227008, 21227021, 21228020, 21229006, 21229041, 21233002, 21233010, 21235015, 21235033, 21235035, 21237014, 21237021, 21237022, 21237023, 21239010, 21241015, 21241016, 21242028, 21243007, 21243008, 21243033, 21243038, 21244023, 21244024, 21245003,
+  // Au+Au 11.5 GeV
+  20344004, 20344006, 20344007, 20344008, 20344009, 20344013, 20344014, 20344015, 20347037, 20347035, 20347036, 20347038, 20347039, 20348023, 20351062, 20351067, 20354051, 20354053, 20355004, 20356005, 20356007, 20356020, 20356022, 20356023, 20357022, 20361014, 20361017, 20363010, 21003011, 21004021, 21005039, 21005040, 21005041, 21006008, 21006029, 21006031, 21007034, 21010036, 21011001, 21011004, 21012034, 21012035, 21013016, 21014027, 21015031, 21015029, 21017048, 21019016, 21019020, 21019069, 21019073, 21021009, 21021010, 21021011, 21025042, 21041025, 21041026, 21050043, 21045044, 21046005, 21046045, 21046046, 21046047, 21046048, 21048061, 21050044, 21050045, 21050046, 21050047, 21050048, 21050049, 21050050, 21050052, 21050053, 21050054, 21050055, 21050056, 21050057, 21050058, 21052039, 21053060, 21053061, 21053062, 21053063, 21053064  
 };
 
 //
 // Run 21
 // 1. Au+Au 7.7 GeV (139)
+// 2. Au+Au 17.3 GeV (26)
+// 3. d+Au 200 GeV (2021) (14)
 //
-const Int_t nBadRun_refmult_2021 = 139;
+const Int_t nBadRun_refmult_2021 = 165;
 const Int_t badrun_refmult_2021[nBadRun_refmult_2021] = {
   // Au+Au 7.7 GeV
-  22031054, 22033001, 22035002, 22038009, 22039010, 22039013, 22039028, 22042004, 22043046, 22043047, 22044003, 22044004, 22044005, 22046006, 22046007, 22046012, 22047008, 22048002, 22048007, 22048040, 22048042, 22049026, 22049027, 22049029, 22050003, 22050006, 22050016, 22050038, 22050040, 22050044, 22050045, 22051014, 22052032, 22052033, 22052035, 22052036, 22052048, 22053022, 22054007, 22054022, 22054028, 22054030, 22054042, 22055023, 22057010, 22058037, 22059005, 22061012, 22061015, 22062034, 22062035, 22062036, 22063014, 22064025, 22064038, 22065014, 22065015, 22067039, 22068012, 22068041, 22069030, 22069032, 22069033, 22069034, 22069040, 22070001, 22070002, 22070003, 22070004, 22070005, 22070006, 22070007, 22070008, 22070009, 22070010, 22070011, 22070012, 22070014, 22070040, 22070041, 22071036, 22074009, 22074042, 22076033, 22076034, 22077050, 22078016, 22078032, 22079027, 22084029, 22084035, 22085009, 22085021, 22086027, 22087027, 22088034, 22091018, 22091022, 22091025, 22093029, 22094046, 22095027, 22096003, 22096037, 22097016, 22097030, 22098054, 22099024, 22099042, 22100045, 22101016, 22101017, 22101018, 22101022, 22102034, 22103027, 22103032, 22104027, 22105030, 22106032, 22108050, 22109032, 22110025, 22111047, 22112021, 22113001, 22113029, 22114030, 22115004, 22115008, 22115019, 22115032, 22116007, 22116008, 22116025, 22116026, 22116030, 22117023, 22118058
+  22031054, 22033001, 22035002, 22038009, 22039010, 22039013, 22039028, 22042004, 22043046, 22043047, 22044003, 22044004, 22044005, 22046006, 22046007, 22046012, 22047008, 22048002, 22048007, 22048040, 22048042, 22049026, 22049027, 22049029, 22050003, 22050006, 22050016, 22050038, 22050040, 22050044, 22050045, 22051014, 22052032, 22052033, 22052035, 22052036, 22052048, 22053022, 22054007, 22054022, 22054028, 22054030, 22054042, 22055023, 22057010, 22058037, 22059005, 22061012, 22061015, 22062034, 22062035, 22062036, 22063014, 22064025, 22064038, 22065014, 22065015, 22067039, 22068012, 22068041, 22069030, 22069032, 22069033, 22069034, 22069040, 22070001, 22070002, 22070003, 22070004, 22070005, 22070006, 22070007, 22070008, 22070009, 22070010, 22070011, 22070012, 22070014, 22070040, 22070041, 22071036, 22074009, 22074042, 22076033, 22076034, 22077050, 22078016, 22078032, 22079027, 22084029, 22084035, 22085009, 22085021, 22086027, 22087027, 22088034, 22091018, 22091022, 22091025, 22093029, 22094046, 22095027, 22096003, 22096037, 22097016, 22097030, 22098054, 22099024, 22099042, 22100045, 22101016, 22101017, 22101018, 22101022, 22102034, 22103027, 22103032, 22104027, 22105030, 22106032, 22108050, 22109032, 22110025, 22111047, 22112021, 22113001, 22113029, 22114030, 22115004, 22115008, 22115019, 22115032, 22116007, 22116008, 22116025, 22116026, 22116030, 22117023, 22118058,
+  // Au+Au 17.3 GeV
+  22145017, 22145020, 22145022, 22145027, 22145044, 22145047, 22146011, 22147001, 22148016, 22150030, 22151020, 22152012, 22152016, 22152017, 22152018, 22153004, 22154004, 22155032, 22155033, 22156024, 22156026, 22156031, 22157014, 22157020, 22157022, 22158012
+  // d+Au 200 GeV (2021)
+  // 22183004, 22183005, 22183006, 22183007, 22184023, 22184001, 22185004, 22187018, 22184002, 22186006, 22186013, 22186014, 22187003, 22187007
 };
 
 #endif

StRoot/StRefMultCorr/CentralityMaker.cxx

@@ -47,6 +47,7 @@ CentralityMaker::CentralityMaker() {
   fRefMult3Corr = new StRefMultCorr("refmult3") ;
   fRefMultCorr_Isobar  = new StRefMultCorr("refmult","Isobar") ;
   fRefMultCorrFxt = new StRefMultCorr("fxtmult");
+  // fRefMult6Corr = new StRefMultCorr("refmult6");
  // fTofTrayMultCorr = new StRefMultCorr("toftray") ;
   fgRefMultCorr  = new StRefMultCorr("grefmult") ;
   fgRefMultCorr_Run14_AuAu200_VpdMB5_P16id = new StRefMultCorr("grefmult","Run14_AuAu200_VpdMB5","P16id") ;
@@ -97,6 +98,13 @@ StRefMultCorr* CentralityMaker::getRefMultCorrFxt() {
   return fRefMultCorrFxt;
 }
 
+/*
+//_________________
+StRefMultCorr* CentralityMaker::getRefMult6Corr() {
+  return fRefMult6Corr;
+}
+*/
+
 /*
 //_________________
 StRefMultCorr* CentralityMaker::getTofTrayMultCorr() {

StRoot/StRefMultCorr/CentralityMaker.h

@@ -58,6 +58,7 @@ class CentralityMaker {
     StRefMultCorr* getRefMult3Corr() ; // For refmult3
     StRefMultCorr* getRefMultCorr_Isobar()  ; // For refmult
     StRefMultCorr* getRefMultCorrFxt(); // For fixed-target data
+    // StRefMultCorr* getRefMult6Corr() ; // For refmult6
     // StRefMultCorr* getTofTrayMultCorr() ; // For TOF tray multiplicity
     StRefMultCorr* getgRefMultCorr()  ; // For grefmult //Run14 AuAu200GeV
     StRefMultCorr* getgRefMultCorr_Run14_AuAu200_VpdMB5_P16id()  ; 
@@ -80,6 +81,7 @@ class CentralityMaker {
     StRefMultCorr* fRefMult3Corr ; // refmult3-based centrality
     StRefMultCorr* fRefMultCorr_Isobar  ; // refmult based centrality
     StRefMultCorr* fRefMultCorrFxt; // fxtMult-based centrality
+    // StRefMultCorr* fRefMult6Corr ; // refmult6-based centrality
     // StRefMultCorr* fTofTrayMultCorr ; // tofTrayMult-based centrality
     StRefMultCorr* fgRefMultCorr  ; // grefmult-based centrality
     StRefMultCorr* fgRefMultCorr_Run14_AuAu200_VpdMB5_P16id  ;

StRoot/StRefMultCorr/Param.cxx

@@ -18,6 +18,7 @@ const string getParamX( const int x, const int y1, const int y2 ) {
     case 3:  str = mParamStr_ref3[y1][y2]; break;
     case 4:  str = mParamStr_ref4[y1][y2]; break;
     case 5:  str = mParamStr_ref5[y1][y2]; break;
+    // case 6:  str = mParamStr_ref6[y1][y2]; break;
     default: str = "0";
   }
   return str;