From 5af0a27caa7d5387e6fc4de7884c4ce99269ea16 Mon Sep 17 00:00:00 2001 From: jakubkubat Date: Wed, 15 Aug 2018 11:42:35 +0200 Subject: [PATCH 1/6] commented out some cout --- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx index 38063f9..3e0932b 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx @@ -564,7 +564,7 @@ bool StMyAnalysisMaker::SelectEvent(StPicoEvent* eve){ // some cuts are already if (! SelectTrigger(eve)) return false; hEventCuts->Fill(1); - cout << "Triggered event found in SelectEvent" << endl; + //cout << "Triggered event found in SelectEvent" << endl; //if ( fabs( eve->vzVpd() ) > 30) return false; // NEVER USE THIS hEventCuts->Fill(2); @@ -855,7 +855,7 @@ void StMyAnalysisMaker::DoRefMultCorr(StPicoEvent* eve) { bool StMyAnalysisMaker::FillEMCEFF(StPicoTrack* t, char* signs) { #ifdef EMCEFF if (signs != "LS" && signs != "US") { - cout << "Argument signs of FillEMCEFF must be either LS or US" << endl; + //cout << "Argument signs of FillEMCEFF must be either LS or US" << endl; return false; } @@ -1053,7 +1053,7 @@ bool StMyAnalysisMaker::FillTree() { // select event if (! SelectTrigger(mEvent)) return false; - cout << "Triggered event found in FillTree()" << endl; + //cout << "Triggered event found in FillTree()" << endl; hFillTree->Fill(1); if ( fabs( mEvent->primaryVertex().z() ) > 100) return false; hFillTree->Fill(2); @@ -1095,7 +1095,7 @@ bool StMyAnalysisMaker::FillTree() { hFillTree->Fill(5); //find electrons - cout << "Looking for electrons" << endl; + //cout << "Looking for electrons" << endl; int nTracks = mPicoDst->numberOfTracks(); int nElectrons=0; for (int iTrk = 0; iTrk < nTracks; iTrk++) @@ -1123,7 +1123,7 @@ bool StMyAnalysisMaker::FillTree() { #endif if (! emctraits) { - cout << "in FillTree() emctraits is NULL" << endl; + //cout << "in FillTree() emctraits is NULL" << endl; continue; } hFillTreeElectrons->Fill(2); @@ -1229,7 +1229,7 @@ bool StMyAnalysisMaker::FillTree() { } hFillTreeNElectrons->Fill(nElectrons); if (nElectrons < 2) return false; - cout << "Electron candidates for upsilon were found in FillTree()" << endl; + //cout << "Electron candidates for upsilon were found in FillTree()" << endl; hFillTree->Fill(6); tEventId = mEvent->eventId(); From 16c04549ce730d7f9353fd0fa2028aad01305dec Mon Sep 17 00:00:00 2001 From: jakubkubat Date: Wed, 15 Aug 2018 15:26:53 +0200 Subject: [PATCH 2/6] bemc towers histograms --- .../StMyAnalysisMaker/StMyAnalysisMaker.cxx | 27 ++++++++++++++++--- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h | 4 ++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx index 3e0932b..b1ccb3f 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx @@ -321,8 +321,10 @@ void StMyAnalysisMaker::DeclareHistograms() { hFillTreeNElectrons = new TH1F("hFillTreeNElectrons","",100,0,100); hPidTraitsIndex = new TH1F("hPidTraitsIndex","",100,0,1000); hPidTraitsIndexTree = new TH1F("hPidTraitsIndexTree","",100,0,1000); - hElectronsTrigAdcId = new TH2F("hElectronsTrigAdcId","",100,0,100,5000,0,5000); - + hElectronTrigAdcId = new TH2F("hElectronTrigAdcId","",100,0,100,5000,0,5000); + hTrigEtaPhi = new TH2F("hTrigEtaPhi","",300,-1.5,1.5,640,-3.2,3.2); + hElectronTrigEtaPhi = new TH2F("hTrigEtaPhi","",300,-1.5,1.5,640,-3.2,3.2); + //hEventVzNPrimaries = new TH2F("hEventVzNPrimaries","",70,-35,35,); //; hIMpp = new TH3F("hIMpp","",200,0,20,10,1,21,11,-1.5,9.5); @@ -490,7 +492,9 @@ void StMyAnalysisMaker::WriteHistograms() { hFillTreeNElectrons->Write(); hPidTraitsIndex->Write(); hPidTraitsIndexTree->Write(); - hElectronsTrigAdcId->Write(); + hElectronTrigAdcId->Write(); + hTrigEtaPhi->Write(); + hElectronTrigEtaPhi->Write(); hIMpp->Write(); hIMmm->Write(); @@ -1488,6 +1492,8 @@ Int_t StMyAnalysisMaker::Make() { } //------------------------------------------------------- + int trigTowerEta = 0; + int trigTowerPhi = 0; // TRIG TOWER SELECTION---------------------------------- vector TrigTowers1; @@ -1499,6 +1505,13 @@ Int_t StMyAnalysisMaker::Make() { #ifdef VERS_P17 StPicoBTowHit* bhit = mPicoDst->btowHit(i); #endif + + trigTowerEta = 0; + trigTowerPhi = 0; + geomBEMC->getEta(bhit->id(),trigTowerEta); + geomBEMC->getPhi(bhit->id(),trigTowerPhi); + hTrigEtaPhi->Fill(trigTowerEta,trigTowerPhi); + if (bhit->adc()>>4 < 19) continue; for (int j = 0; j < nTrig; j++) { @@ -1721,7 +1734,13 @@ Int_t StMyAnalysisMaker::Make() { fabs(pidE0 - bhit->energy() ) > 0.01 ) continue; isTrigger1 = true; hElectronTowervp->Fill(t->pMom().mag(),bhit->id()); - hElectronsTrigAdcId->Fill(bhit->adc(),bhit->id()); + hElectronTrigAdcId->Fill(bhit->adc(),bhit->id()); + + trigTowerEta = 0; + trigTowerPhi = 0; + geomBEMC->getEta(bhit->id(),trigTowerEta); + geomBEMC->getPhi(bhit->id(),trigTowerPhi); + hElectronTrigEtaPhi->Fill(trigTowerEta,trigTowerPhi); } #endif if (isTrigger1) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h index fc220eb..f02745b 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h @@ -189,7 +189,9 @@ class StMyAnalysisMaker : public StMaker { TH1F* hFillTreeNElectrons; TH1F* hPidTraitsIndex; TH1F* hPidTraitsIndexTree; - TH2F* hElectronsTrigAdcId; + TH2F* hElectronTrigAdcId; + TH2F* hTrigEtaPhi; + TH2F* hElectronTrigEtaPhi //; TH3F* hIMpp; From 88854c8b9ba9fd6b0d5719d914e97cf7b0ed75e4 Mon Sep 17 00:00:00 2001 From: jakubkubat Date: Wed, 15 Aug 2018 15:36:16 +0200 Subject: [PATCH 3/6] .h --- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h index f02745b..ae8ae87 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h @@ -191,7 +191,7 @@ class StMyAnalysisMaker : public StMaker { TH1F* hPidTraitsIndexTree; TH2F* hElectronTrigAdcId; TH2F* hTrigEtaPhi; - TH2F* hElectronTrigEtaPhi + TH2F* hElectronTrigEtaPhi; //; TH3F* hIMpp; From d6de7d620b3d64d3ab02dadf823bb0ace676dc4d Mon Sep 17 00:00:00 2001 From: jakubkubat Date: Wed, 15 Aug 2018 15:41:57 +0200 Subject: [PATCH 4/6] fix --- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx index b1ccb3f..6590437 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx @@ -1492,8 +1492,8 @@ Int_t StMyAnalysisMaker::Make() { } //------------------------------------------------------- - int trigTowerEta = 0; - int trigTowerPhi = 0; + float trigTowerEta = 0; + float trigTowerPhi = 0; // TRIG TOWER SELECTION---------------------------------- vector TrigTowers1; From 91a8727cc44fb095fc2117a7e05369507735b1f1 Mon Sep 17 00:00:00 2001 From: jakubkubat Date: Wed, 15 Aug 2018 23:24:38 +0200 Subject: [PATCH 5/6] TrackEtaPhiPtPrimOnly hist --- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx | 8 ++++++-- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx index 6590437..5efdf26 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx @@ -250,7 +250,7 @@ void StMyAnalysisMaker::DeclareHistograms() { hEventNPrimariesCent = new TH2F("hEventNPrimariesCent","",10,0,10,2000,0,2000); hEventVzvsNPrim = new TH3F("hEventVzvsNPrim","",400,-50,50,2000,0,2000,10,0,10); - hEventVzvsNPrimHard = new TH3F("hEventVzvsNPrimHard","",400,-50,50,2000,0,2000,10,0,10); + hEventVzvsNPrimHard = new TH3F("hEventVzvsNPrimHard","",400,-50,50,2000,0,200,10,0,10); hEta = new TH1F("hEta","",300,-3,3); hCorrgrefMult = new TH2F("hCorrgrefMult","", 400,0,800,400,0,800); @@ -324,7 +324,7 @@ void StMyAnalysisMaker::DeclareHistograms() { hElectronTrigAdcId = new TH2F("hElectronTrigAdcId","",100,0,100,5000,0,5000); hTrigEtaPhi = new TH2F("hTrigEtaPhi","",300,-1.5,1.5,640,-3.2,3.2); hElectronTrigEtaPhi = new TH2F("hTrigEtaPhi","",300,-1.5,1.5,640,-3.2,3.2); - //hEventVzNPrimaries = new TH2F("hEventVzNPrimaries","",70,-35,35,); + hTrackEtaPhiPtPrimOnly = new TH3F("hTrackEtaPhiPtPrimOnly","hTrackEtaPhiPtP",450,0,15,160,-1.3,1.3,100,-3.2,3.2); //; hIMpp = new TH3F("hIMpp","",200,0,20,10,1,21,11,-1.5,9.5); @@ -495,6 +495,7 @@ void StMyAnalysisMaker::WriteHistograms() { hElectronTrigAdcId->Write(); hTrigEtaPhi->Write(); hElectronTrigEtaPhi->Write(); + hTrackEtaPhiPtPrimOnly->Write(); hIMpp->Write(); hIMmm->Write(); @@ -1602,6 +1603,9 @@ Int_t StMyAnalysisMaker::Make() { hTracknSigmaPionvsp->Fill(t->pMom().mag(),t->nSigmaPion()); hTrackEtaPhiPtG->Fill(t->gPt(),t->gMom(pvtx, bfield).pseudoRapidity(),t->gMom(pvtx, bfield).phi()); hTrackEtaPhiPtP->Fill(t->pMom().perp(),t->pMom().pseudoRapidity(),t->pMom().phi()); + if(t->pMom().mag()>0){ + hTrackEtaPhiPtPrimOnly->Fill(t->pMom().perp(),t->pMom().pseudoRapidity(),t->pMom().phi()); + } //hTrackDca->Fill(dca); hTracknHitsRatio->Fill((float)t->nHitsFit()/t->nHitsMax()); hTracknHitsFit->Fill(t->nHitsFit()); diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h index ae8ae87..b80bd2c 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.h @@ -192,6 +192,7 @@ class StMyAnalysisMaker : public StMaker { TH2F* hElectronTrigAdcId; TH2F* hTrigEtaPhi; TH2F* hElectronTrigEtaPhi; + TH3F* hTrackEtaPhiPtPrimOnly; //; TH3F* hIMpp; From 2873bd5aec99148bc1c3bc4f8eb99640b009c3c4 Mon Sep 17 00:00:00 2001 From: jakubkubat Date: Thu, 16 Aug 2018 10:16:23 +0200 Subject: [PATCH 6/6] changed range of TrigIDvsAdc histos --- StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx index 5efdf26..c6451a1 100644 --- a/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx +++ b/StRoot/StMyAnalysisMaker/StMyAnalysisMaker.cxx @@ -260,7 +260,7 @@ void StMyAnalysisMaker::DeclareHistograms() { hCorrWeight = new TH1F("hCorrWeight","",100,0.9,1.1); hTrigFlag = new TH1F("hTrigFlag","hTrigFlag",20,0,20); - hTrigAdcId = new TH2F("hTrigAdcId","hTrigAdcId",100,0,100,5000,0,5000); + hTrigAdcId = new TH2F("hTrigAdcId","hTrigAdcId",200,0,1000,5000,0,5000); //changed x range and binning hBtowAdcId = new TH2F("hBtowAdcId","hBtowAdcId",200,0,1000,5000,0,5000); @@ -321,7 +321,7 @@ void StMyAnalysisMaker::DeclareHistograms() { hFillTreeNElectrons = new TH1F("hFillTreeNElectrons","",100,0,100); hPidTraitsIndex = new TH1F("hPidTraitsIndex","",100,0,1000); hPidTraitsIndexTree = new TH1F("hPidTraitsIndexTree","",100,0,1000); - hElectronTrigAdcId = new TH2F("hElectronTrigAdcId","",100,0,100,5000,0,5000); + hElectronTrigAdcId = new TH2F("hElectronTrigAdcId","",200,0,1000,5000,0,5000); hTrigEtaPhi = new TH2F("hTrigEtaPhi","",300,-1.5,1.5,640,-3.2,3.2); hElectronTrigEtaPhi = new TH2F("hTrigEtaPhi","",300,-1.5,1.5,640,-3.2,3.2); hTrackEtaPhiPtPrimOnly = new TH3F("hTrackEtaPhiPtPrimOnly","hTrackEtaPhiPtP",450,0,15,160,-1.3,1.3,100,-3.2,3.2); @@ -1299,7 +1299,7 @@ Int_t StMyAnalysisMaker::Make() { #ifdef FULLTREE if (FillTree()){ upsTree->Fill(); - cout << "Tree was filled -- FillTree() returned true" << endl; + //cout << "Tree was filled -- FillTree() returned true" << endl; hFillTree->Fill(7); } #endif