Commit 4b383706 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Merge branch 'Cubix' of gitlab.in2p3.fr:dudouet/gammaware into Cubix

parents 4bd6053e 429b8113
Pipeline #64567 passed with stage
in 8 minutes and 50 seconds
...@@ -47,6 +47,7 @@ private: ...@@ -47,6 +47,7 @@ private:
TGNumberEntry *fNItersButton2D[2]={}; TGNumberEntry *fNItersButton2D[2]={};
TGRadioButton *fDirectionButton1D[2]={}; TGRadioButton *fDirectionButton1D[2]={};
array<TGRadioButton*,4> fFilterOrderButton1D={}; array<TGRadioButton*,4> fFilterOrderButton1D={};
array<TGRadioButton*,7> fSmoothingButton1D={}; array<TGRadioButton*,7> fSmoothingButton1D={};
......
...@@ -63,7 +63,6 @@ void CXFit::AddArrow(Double_t Energy) ...@@ -63,7 +63,6 @@ void CXFit::AddArrow(Double_t Energy)
Energy = fHistogram->GetBinCenter(Bin); Energy = fHistogram->GetBinCenter(Bin);
Double_t MaxGlob = fHistogram->GetMaximum(); Double_t MaxGlob = fHistogram->GetMaximum();
auto *arrow = new CXArrow(this,Energy,(Value + MaxGlob/100.) ,(Value +MaxGlob/15.),0.01,"<|"); auto *arrow = new CXArrow(this,Energy,(Value + MaxGlob/100.) ,(Value +MaxGlob/15.),0.01,"<|");
arrow->SetAngle(30); arrow->SetAngle(30);
arrow->SetLineWidth(2); arrow->SetLineWidth(2);
arrow->Draw(); arrow->Draw();
......
...@@ -892,6 +892,7 @@ TH1 *CXMainWindow::GetHisto(TVirtualPad *pad, bool GetFirst) ...@@ -892,6 +892,7 @@ TH1 *CXMainWindow::GetHisto(TVirtualPad *pad, bool GetFirst)
obj = lnk->GetObject(); obj = lnk->GetObject();
if (obj->InheritsFrom(TH1::Class()) && strncmp(obj->GetName() ,"hframe",strlen(obj->GetName())) != 0) { if (obj->InheritsFrom(TH1::Class()) && strncmp(obj->GetName() ,"hframe",strlen(obj->GetName())) != 0) {
hist = dynamic_cast<TH1*>(obj); hist = dynamic_cast<TH1*>(obj);
hist->Print();
if(GetFirst) return hist; if(GetFirst) return hist;
} }
lnk = (TObjOptLink*)lnk->Next(); lnk = (TObjOptLink*)lnk->Next();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment