Backport the latest TpcRS code and Run19 parameters to SL21c (#294)

* Backport PR#281 to SL21c

* Update StMcEventMaker.cxx

Remove "#ifdef 0" that commented out some subsystem hits

* Backport the latest TpcRS code and Run19 parameters to SL21c

Co-authored-by: Xin Dong <[email protected]>

Author: zhux97

StRoot/StTpcRSMaker/StTpcRSMaker.cxx

@@ -819,7 +819,7 @@ Int_t StTpcRSMaker::Make(){  //  PrintInfo();
 	TrackSegmentHits[nSegHits].indx = indx;
 	TrackSegmentHits[nSegHits].s = tpc_hitC->length;
 	if (tpc_hitC->length == 0 && nSegHits > 0) {
-	  TrackSegmentHits[nSegHits].s = TrackSegmentHits[nSegHits-1].s + TrackSegmentHits[nSegHits].tpc_hitC->ds;
+	  TrackSegmentHits[nSegHits].s = TrackSegmentHits[nSegHits-1].s + tpc_hitC->ds;
 	}
 	TrackSegment2Propagate(tpc_hitC, &gver[id3-1],TrackSegmentHits[nSegHits]);
  	if (TrackSegmentHits[nSegHits].Pad.timeBucket() < 0 || TrackSegmentHits[nSegHits].Pad.timeBucket() > NoOfTimeBins) continue;
@@ -1276,8 +1276,11 @@ Int_t StTpcRSMaker::Make(){  //  PrintInfo();
 	  UInt_t ntimebins = digitalSector->numberOfTimeBins(row,pad);
 	  if (! ntimebins) continue;
 	  static  Short_t ADCs[__MaxNumberOfTimeBins__];
+#ifdef __TFG__VERSION__
+	  static  Int_t IDTs[__MaxNumberOfTimeBins__];
+#else /* ! __TFG__VERSION__ */
 	  static UShort_t IDTs[__MaxNumberOfTimeBins__];
-	  //	  static Int_t IDTs[__MaxNumberOfTimeBins__];
+#endif /* __TFG__VERSION__ */
 	  digitalSector->getTimeAdc(row,pad,ADCs,IDTs);
 	  for (UInt_t t = 0; t < __MaxNumberOfTimeBins__; t++) {
 	    if (ADCs[t] > 0 && IDTs[t]) {
@@ -1493,7 +1496,11 @@ StTpcDigitalSector  *StTpcRSMaker::DigitizeSector(Int_t sector){
       if (gain <= 0.0) continue;
       ped    = St_TpcResponseSimulatorC::instance()->AveragePedestal();
       static  Short_t ADCs[__MaxNumberOfTimeBins__];
+#ifdef __TFG__VERSION__
+      static  Int_t IDTs[__MaxNumberOfTimeBins__];
+#else /* ! __TFG__VERSION__ */
       static UShort_t IDTs[__MaxNumberOfTimeBins__];
+#endif /* __TFG__VERSION__ */
       memset(ADCs, 0, sizeof(ADCs));
       memset(IDTs, 0, sizeof(IDTs));
       Int_t NoTB = 0;

StarDb/Calibrations/tpc/TpcResponseSimulator.y2019.C

@@ -89,14 +89,14 @@ TDataSet *CreateTable() {
   row.tauXO                 =  74.6e-9;// secs Tpx Outer integration time 
   row.tauCI                 =   0;  
   row.tauCO                 =   0;  
-  row.SigmaJitterTI         = 0.52; //1.5*0.4317/4.5;// 0.4317;// 0.25;//ad  0.0;// b for Tpx inner 
+  row.SigmaJitterTI         = 0.0; //1.5*0.4317/4.5;// 0.4317;// 0.25;//ad  0.0;// b for Tpx inner 
   row.SigmaJitterTO         = 0.52; //1.5*0.4300/5.;// 0.4300;// E: 0.4801;//0.25;//ad  0.0;// b for Tpx outer 
   row.SigmaJitterXI         = 0.1027785/2.;// 0.1027785; // P: 0.1353*1.05/1.10; //O: 0.1353*1.05;// N: 0.1353; // C:0.;
   row.SigmaJitterXO         = 0.107525/2.; // 0.107525;  // P: 0.1472*1.05/1.03; //O: 0.1472*1.05;// N: 0.1472; // C:0.;
   row.longitudinalDiffusion = 0.03624; // Magboltz // HD 0.03624*1.5; //HC 0.03624; // Magboltz 
-  row.longitudinalDiffusionI= row.longitudinalDiffusion;
+  row.longitudinalDiffusionI= row.longitudinalDiffusion*0.63;
   row.transverseDiffusion   = 0.02218*TMath::Sqrt(1 + row.OmegaTau*row.OmegaTau) ; // Magboltz
-  row.transverseDiffusionI  = 0.896  *row.transverseDiffusion;
+  row.transverseDiffusionI  = 0.66  *row.transverseDiffusion;
   row.NoElPerAdc            = 335.;   // No. of electrons per 1 ADC count
   row.OmegaTauScaleI        =  2.145*1.515;// HC 1.;// 2.145*1.515;  //i; 2.145*1.4;  //h 2.145;  //ad 2.145*1.25;  //b effective reduction of OmegaTau near Inner sector anode wire
   row.OmegaTauScaleO        = 1.8  *1.201;  //HC 1.;// 1.8  *1.201;  //i 1.8  *1.1;    //h 1.8;    //ad 1.8  *1.25;  //b effective reduction of OmegaTau near Outer sector anode wire
@@ -127,8 +127,8 @@ TDataSet *CreateTable() {
   //row.T0offset   = 0.50 + 1.65431e-01 -  3.45247e-01 -1.54583e+00 -2.90686e-03+ 1.54353e+00 + 0.0191135  -1.20938e-03 ; //E
   // row.T0offset   = 0.50 -1.43663e-01 -0.00932877;//g // 01/18/12 Xianglei Zhu from Run 11 AuAu 27 & 19.6 GeV embedding 
   row.T0offset   = 0.50 -1.43663e-01 -0.00932877 + 0.0416;//g // 12/18/19 from Run 19 AuAu19.6 GeV simulation
-  row.T0offsetI  =  0.0803082                      -0.145027; // ~/work/Tpc/TpcRS/2019/TpcRS_19GeV; TI_1->Fit("pol2"); par[0]
-  row.T0offsetO  = 0.5*(-6.04314e-02-3.44168e-02)-0.00930199;// TO_1->Fit("pol2","er","",-100,0) => par[0] = -6.04314e-02; TO_1->Fit("pol2","er","",0,100); par[0] = -3.44168e-02 ?
+  row.T0offsetI  = -1.58786167960479896e-01;
+  row.T0offsetO  = -1.94071983062808762e-01-1.76429075511644329e-02;
 
   tableSet->AddAt(&row);
   // ----------------- end of code ---------------