Просмотр исходного кода

Update:
- Added runId range for all datasets
- Changed delta-eta-gap defauld value

PeterParfenov лет назад: 4
Родитель
Сommit
48c46afd47

+ 4 - 4
Constants.h

@@ -3,8 +3,8 @@
 
 //Used runIds
 // Dataset2
-const int runId_min = 12132008;
-const int runId_max = 12137039;
+// const int runId_min = 12132008;
+// const int runId_max = 12137039;
 // Dataset3
 // const int runId_min = 12153008;
 // const int runId_max = 12158001;
@@ -12,8 +12,8 @@ const int runId_max = 12137039;
 // const int runId_min = 12158001;
 // const int runId_max = 12163058;
 // Dataset5
-// const int runId_min = 12163058;
-// const int runId_max = 12171016;
+const int runId_min = 12163058;
+const int runId_max = 12171016;
 
 // Constants
 const int fNCent = 16;

+ 8 - 8
FemtoDstAnalyzer_FlowChargedHadrons.C

@@ -1091,8 +1091,8 @@ void FemtoDstAnalyzer_FlowChargedHadrons(const Char_t *inFile = "st_physics_1215
   TProfile2D *p_v2run_ZDC_East[16]; // runId vs pt
   TProfile2D *p_v2run_ZDC_West[16]; // runId vs pt
 
-  TH2D *p_ptrun[16]; // to calculate <pT> for each pT bin
-  TH2D *p1_ptrun[16]; // to calculate <pT> for each pT bin
+  //TH2D *p_ptrun[16]; // to calculate <pT> for each pT bin
+  //TH2D *p1_ptrun[16]; // to calculate <pT> for each pT bin
 
   /*TProfile2D *p_v2cent_EP_3subTPC;
   TProfile2D *p_v2cent_EP_3subBBCEast;
@@ -1464,7 +1464,7 @@ void FemtoDstAnalyzer_FlowChargedHadrons(const Char_t *inFile = "st_physics_1215
     }
 
     // Apply recentering
-    for (int iHarm = 0; iHarm < fNharmonics + 1; iHarm++)
+    for (int iHarm = 0; iHarm < fNharmonics; iHarm++)
     {
       TVector2 recFullTMP((Double_t)p_BBC_Qx_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()],
                           (Double_t)p_BBC_Qy_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()]);
@@ -2051,8 +2051,8 @@ void FemtoDstAnalyzer_FlowChargedHadrons(const Char_t *inFile = "st_physics_1215
         flow2EP = TMath::Cos(2. * (femtoTrack->phi() - psiEP_ZDC_West[0])) / res2EP;
         p_v2run_ZDC_West[(Int_t)event->cent16()]->Fill(event->runId(), femtoTrack->pt(), flow2EP, weight);
         ///////////////////////////////////////////////////////////////////////////////////////////
-        p_ptrun[(Int_t)event->cent16()]->Fill(event->runId(), femtoTrack->pt(), weight);
-        p1_ptrun[(Int_t)event->cent16()]->Fill(event->runId(), femtoTrack->pt(), 1.);
+        //p_ptrun[(Int_t)event->cent16()]->Fill(event->runId(), femtoTrack->pt(), weight);
+        //p1_ptrun[(Int_t)event->cent16()]->Fill(event->runId(), femtoTrack->pt(), 1.);
         /*
         // 3-sub method
       
@@ -2253,8 +2253,8 @@ void FemtoDstAnalyzer_FlowChargedHadrons(const Char_t *inFile = "st_physics_1215
     {
       if (iGap == 0)
       {
-        p_ptrun[iCent]->Write();
-        p1_ptrun[iCent]->Write();
+        //p_ptrun[iCent]->Write();
+        //p1_ptrun[iCent]->Write();
       }
     }
     /*p_v2_VtxZsys[iGap]->Write();
@@ -2526,4 +2526,4 @@ Double_t GetZDCPosition(Int_t eastwest, Int_t verthori, Int_t strip)
     return zdcsmd_y[strip] / sqrt(2.) - mZDCSMDCenterwy;
 
   return -999.;
-}
+}

+ 16 - 11
FemtoDstAnalyzer_FlowPIDHadrons.C

@@ -1430,7 +1430,7 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
     }
 
     // Apply recentering
-    for (int iHarm = 0; iHarm < fNharmonics + 1; iHarm++)
+    for (int iHarm = 0; iHarm < fNharmonics; iHarm++)
     {
       TVector2 recFullTMP((Double_t)p_BBC_Qx_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()],
                           (Double_t)p_BBC_Qy_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()]);
@@ -1958,6 +1958,8 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
           //for (int iPID=0; iPID<3; iPID++)
           //{
 	    //TPC-only
+	    //if (!femtoTrack->isTofTrack()) continue;
+			
 	    if (!femtoTrack->isTofTrack())
 	    {
 	      //pion id
@@ -2000,10 +2002,12 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
                 i_part = 2;
               }
             }
+      
 	    //TPC+TOF
+
 	    if (isGoodPID(femtoTrack))
 	    {
-/*		XY_pid = GetNewXY(femtoTrack);
+		/*XY_pid = GetNewXY(femtoTrack);
 		if (isMesonXY(XY_pid.first, XY_pid.second))
 		{
 	  	  if ( TMath::Power(XY_pid.first / (2*GetSigmNewX(femtoTrack,0)),2) + TMath::Power(XY_pid.second / (2*GetSigmNewY(femtoTrack,0)),2) < 1. && 
@@ -2027,12 +2031,12 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
               if (femtoTrack->ptot() >= 0.2 && femtoTrack->ptot() < 3.4 &&
 	          TMath::Abs(femtoTrack->nSigmaPion()) < 3 &&
 		  femtoTrack->massSqr() >= -0.15 && femtoTrack->massSqr() < 0.1)// &&
-/*
-                  TMath::Abs(femtoTrack->massSqr() - pionMassSqr) < 2*GetSigmWidth(femtoTrack,0) &&
+
+                 /* TMath::Abs(femtoTrack->massSqr() - pionMassSqr) < 2*GetSigmWidth(femtoTrack,0) &&
                   TMath::Abs(femtoTrack->massSqr() - kaonMassSqr) > 2*GetSigmWidth(femtoTrack,1) &&
                   TMath::Abs(femtoTrack->massSqr() - protMassSqr) > 2*GetSigmWidth(femtoTrack,2) )
-*/
-/*
+
+
                   femtoTrack->massSqr() > pionMassSqr - 2.*sigMsqrPion->Eval(femtoTrack->pt()) &&
                   femtoTrack->massSqr() < pionMassSqr + 2.*sigMsqrPion->Eval(femtoTrack->pt()) &&
                   (femtoTrack->massSqr() < kaonMassSqr - 2.*sigMsqrKaon->Eval(femtoTrack->pt()) ||
@@ -2051,8 +2055,8 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
                   TMath::Abs(femtoTrack->massSqr() - pionMassSqr) > 2.5*GetSigmWidth(femtoTrack,0) &&
                   TMath::Abs(femtoTrack->massSqr() - kaonMassSqr) < 2*GetSigmWidth(femtoTrack,1) &&
                   TMath::Abs(femtoTrack->massSqr() - protMassSqr) > 2*GetSigmWidth(femtoTrack,2) )
-*/
-/*
+
+
                   femtoTrack->massSqr() > kaonMassSqr - 2.*sigMsqrKaon->Eval(femtoTrack->pt()) &&
                   femtoTrack->massSqr() < kaonMassSqr + 2.*sigMsqrKaon->Eval(femtoTrack->pt()) &&
                   (femtoTrack->massSqr() < pionMassSqr - 2.5*sigMsqrPion->Eval(femtoTrack->pt()) ||
@@ -2071,8 +2075,8 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
                   TMath::Abs(femtoTrack->massSqr() - pionMassSqr) > 2*GetSigmWidth(femtoTrack,0) &&
                   TMath::Abs(femtoTrack->massSqr() - kaonMassSqr) > 2*GetSigmWidth(femtoTrack,1) &&
                   TMath::Abs(femtoTrack->massSqr() - protMassSqr) < 2*GetSigmWidth(femtoTrack,2) )
-*/
-/*
+
+
                   femtoTrack->massSqr() > protMassSqr - 2.*sigMsqrProton->Eval(femtoTrack->pt()) &&
                   femtoTrack->massSqr() < protMassSqr + 2.*sigMsqrProton->Eval(femtoTrack->pt()) &&
                   (femtoTrack->massSqr() < pionMassSqr - 2.*sigMsqrPion->Eval(femtoTrack->pt()) ||
@@ -2086,6 +2090,7 @@ void FemtoDstAnalyzer_FlowPIDHadrons(const Char_t *inFile = "st_physics_12150008
 
             }
 	  //}
+
           if (i_part == -1) continue;
 
           //EAST
@@ -2584,4 +2589,4 @@ Double_t GetZDCPosition(Int_t eastwest, Int_t verthori, Int_t strip)
     return zdcsmd_y[strip] / sqrt(2.) - mZDCSMDCenterwy;
 
   return -999.;
-}
+}

+ 2 - 2
FemtoDstAnalyzer_QA.C

@@ -1553,7 +1553,7 @@ void FemtoDstAnalyzer_QA(const Char_t *inFile = "st_physics_12150008_raw_4030001
     }
 
     // Apply recentering
-    for (int iHarm = 0; iHarm < fNharmonics+1; iHarm++)
+    for (int iHarm = 0; iHarm < fNharmonics; iHarm++)
     {
      TVector2 recFullTMP((Double_t)p_BBC_Qx_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()],
                           (Double_t)p_BBC_Qy_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()]);
@@ -2649,4 +2649,4 @@ Bool_t isGoodPID(StFemtoTrack *const &track)
   //NhitsDedx cut applied in StFemtoDst?
   // ToFYLocal cut applied in StFemtoDst?
   return true;
-}
+}

+ 2 - 2
FemtoDstAnalyzer_Resolution.C

@@ -1304,7 +1304,7 @@ void FemtoDstAnalyzer_Resolution(const Char_t *inFile = "st_physics_12150008_raw
     }
 
     // Apply recentering
-    for (int iHarm = 0; iHarm < fNharmonics+1; iHarm++)
+    for (int iHarm = 0; iHarm < fNharmonics; iHarm++)
     {
       TVector2 recFullTMP((Double_t)p_BBC_Qx_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()],
                           (Double_t)p_BBC_Qy_Full_EP[iHarm][VtxSign][(Int_t)event->cent16()][(Double_t)event->runId()]);
@@ -2145,4 +2145,4 @@ Double_t GetZDCPosition(Int_t eastwest, Int_t verthori, Int_t strip)
   if(eastwest==1 && verthori==1) return zdcsmd_y[strip]/sqrt(2.)-mZDCSMDCenterwy;
 
   return -999.;
-}
+}