diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
index 0573d4cc1180329490a23db7506ad092c8873a3e..f915b5a4c75520211d90fc8ce9bd9ba0eb52b91c 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
@@ -35,11 +35,9 @@
#include "CbmTrdTrack.h"
#include "CbmTrdTrackFitterKF.h"
#include "CbmVertex.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
+#include "PParticle.h"
#include "TClonesArray.h"
#include "TDirectory.h"
#include "TFile.h"
@@ -53,9 +51,9 @@
#include "TSystem.h"
#include "TTree.h"
#include "TVector3.h"
-
-#include "PParticle.h"
#include "vector"
+
+#include <Logger.h>
using std::vector;
#include <fstream>
@@ -801,7 +799,8 @@ void CbmAnaDimuonAnalysis::Exec(Option_t* /*opt*/)
//----------------- Muon track candidates
Double_t id = -1;
- if (!fUseCuts && fAnnCut < 0) analysis = kTRUE;
+ if (!fUseCuts && fAnnCut < 0)
+ analysis = kTRUE;
else if (fUseCuts) {
if (nStsHits >= fNofStsCut && nMuchHits >= fNofMuchCut && nTrdHits >= fNofTrdCut && nTofHits >= 1
&& chi2vertex <= fChi2VertexCut && chi2sts <= fChi2StsCut && chi2much <= fChi2MuchCut
@@ -815,7 +814,8 @@ void CbmAnaDimuonAnalysis::Exec(Option_t* /*opt*/)
if (id > fAnnCut) {
analysis = kTRUE;
BgSup[5]->Fill(momentum);
- if (isMu == 1 && q > 0) muPl_reco.Ntof = kTRUE;
+ if (isMu == 1 && q > 0)
+ muPl_reco.Ntof = kTRUE;
else if (isMu == 1 && q < 0)
muMn_reco.Ntof = kTRUE;
if (muPl_reco.Ntof && muMn_reco.Ntof) signal_reco.Ntof = kTRUE;
@@ -1137,7 +1137,8 @@ Double_t CbmAnaDimuonAnalysis::CalculateAnnValue(Double_t P, Double_t M, Double_
// -------------------------------------------------------------------------
void CbmAnaDimuonAnalysis::FillProfile(TProfile* profile, Double_t param, Bool_t trigger)
{
- if (trigger) profile->Fill(param, 100);
+ if (trigger)
+ profile->Fill(param, 100);
else
profile->Fill(param, 0);
}
@@ -1153,7 +1154,8 @@ void CbmAnaDimuonAnalysis::Finish()
if (fPlutoFileName != "") {
- if (fAnnCut > 0) name = Form("YPt_histo_ANN_%1.2f.root", fAnnCut);
+ if (fAnnCut > 0)
+ name = Form("YPt_histo_ANN_%1.2f.root", fAnnCut);
else
name = "YPt_histo.root";
@@ -1186,7 +1188,8 @@ void CbmAnaDimuonAnalysis::Finish()
f->Close();
- if (fAnnCut > 0) name = Form("eff_histo_ANN_%1.2f.root", fAnnCut);
+ if (fAnnCut > 0)
+ name = Form("eff_histo_ANN_%1.2f.root", fAnnCut);
else
name = "eff_histo.root";
TFile* ff = new TFile(name, "recreate");
@@ -1279,7 +1282,8 @@ void CbmAnaDimuonAnalysis::Finish()
// fPlutoFile->Close();
}
else {
- if (fAnnCut > 0) name = Form("sup_histo_ANN_%1.2f.root", fAnnCut);
+ if (fAnnCut > 0)
+ name = Form("sup_histo_ANN_%1.2f.root", fAnnCut);
else
name = "sup_histo.root";
TFile* f = new TFile(name, "recreate");
@@ -1291,7 +1295,8 @@ void CbmAnaDimuonAnalysis::Finish()
f->Close();
}
- if (fAnnCut > 0) name = Form("YPtM_ANN_%1.2f.root", fAnnCut);
+ if (fAnnCut > 0)
+ name = Form("YPtM_ANN_%1.2f.root", fAnnCut);
else
name = "YPtM.root";
TFile* f = new TFile(name, "recreate");
diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
index fbfce20ddb100d6922c9f5d79084aa01b6513199..62047558b90aa4de8d7fe7c5c366e58447c1f51c 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
@@ -41,7 +41,7 @@ class TMultiLayerPerceptron;
class TTree;
class CbmAnaDimuonAnalysis : public FairTask {
-public:
+ public:
CbmAnaDimuonAnalysis(TString name, TString setup);
virtual ~CbmAnaDimuonAnalysis() {}
@@ -77,7 +77,7 @@ public:
void FillProfile(TProfile* profile, Double_t param, Bool_t trigger);
-private:
+ private:
Int_t fEvent;
TClonesArray* fMCTracks;
TClonesArray* fStsTracks;
diff --git a/macro/analysis/much/ANN.C b/macro/analysis/much/ANN.C
index 9de146546ff8dd2c2cb8f901e9266185fc1368d3..2511797118da29e484d6eceedcd94e0a6bc1c560 100644
--- a/macro/analysis/much/ANN.C
+++ b/macro/analysis/much/ANN.C
@@ -69,7 +69,8 @@ void ANN(Int_t energy = 8, Int_t NofFiles = 1000, TString dir = "../../much/data
//--------------------------------------------------------
for (int i = 0; i < 2; i++) {
for (int k = 1; k < NofFiles + 1; k++) {
- if (i == 0) name.Form("%s/%s/%dgev/omega/%d/muons.ana.root", dir.Data(), setup.Data(), energy, k);
+ if (i == 0)
+ name.Form("%s/%s/%dgev/omega/%d/muons.ana.root", dir.Data(), setup.Data(), energy, k);
else
name.Form("%s/%s/%dgev/centr/%d/muons.ana.root", dir.Data(), setup.Data(), energy, k);
@@ -126,7 +127,8 @@ void ANN(Int_t energy = 8, Int_t NofFiles = 1000, TString dir = "../../much/data
NofSTS = mu_pl->GetNStsHits();
NofMUCH = mu_pl->GetNMuchHits();
NofTRD = mu_pl->GetNTrdHits();
- if (i == 0) Signal->Fill();
+ if (i == 0)
+ Signal->Fill();
else
Bg->Fill();
}
@@ -165,7 +167,8 @@ void ANN(Int_t energy = 8, Int_t NofFiles = 1000, TString dir = "../../much/data
NofSTS = mu_mn->GetNStsHits();
NofMUCH = mu_mn->GetNMuchHits();
NofTRD = mu_mn->GetNTrdHits();
- if (i == 0) Signal->Fill();
+ if (i == 0)
+ Signal->Fill();
else
Bg->Fill();
}
diff --git a/macro/much/run_ana.C b/macro/much/run_ana.C
index 59edeef4f2f80dd267d1d3409d6e047b5a276325..368e4974e0bd3331febea89342322c7efe601f57 100644
--- a/macro/much/run_ana.C
+++ b/macro/much/run_ana.C
@@ -16,7 +16,8 @@ void run_ana(Int_t nEvents = 1000, TString dataSet = "muons", TString setup = "s
TString parFile = dir + dataSet + ".par.root";
TString recoFile = dir + dataSet + ".rec.root";
TString outFile;
- if (ANN < 0) outFile = dataSet + ".ana.root";
+ if (ANN < 0)
+ outFile = dataSet + ".ana.root";
else
outFile = Form("%s.ana.ANN_%1.2f.root", dataSet.Data(), ANN);
@@ -59,7 +60,9 @@ void run_ana(Int_t nEvents = 1000, TString dataSet = "muons", TString setup = "s
// Initialization of the geometry scheme
auto muchGeoScheme = CbmMuchGeoScheme::Instance();
- if (!muchGeoScheme->IsInitialized()) { muchGeoScheme->Init(parFile, muchFlag); }
+ if (!muchGeoScheme->IsInitialized()) {
+ muchGeoScheme->Init(parFile, muchFlag);
+ }
}
run->AddTask(new CbmTrackingDetectorInterfaceInit());