Commit 947fd3eb authored by Stezowski Olivier's avatar Stezowski Olivier
Browse files

Merge branch 'preprod' into 'master'

Merge preprod to master

See merge request !66
parents 90763052 c4087ae0
Pipeline #140328 passed with stage
in 9 minutes and 58 seconds
...@@ -37,10 +37,10 @@ public: ...@@ -37,10 +37,10 @@ public:
void Update(); void Update();
void Fit(); void Fit();
double DoubleTailedStepedGaussian(double*xx,double*pp); Double_t DoubleTailedStepedGaussian(Double_t*xx,Double_t*pp);
double StepedBackground(double*xx,double*pp); Double_t StepedBackground(Double_t*xx,Double_t*pp);
double PeakFunction(double*xx,double*pp); Double_t PeakFunction(Double_t*xx,Double_t*pp);
double Residue(double*xx,double*pp); Double_t Residue(Double_t*xx,Double_t*pp);
void Clear(TVirtualPad *pad = nullptr); void Clear(TVirtualPad *pad = nullptr);
......
This diff is collapsed.
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
void Checked(TObject *obj, Bool_t check); void Checked(TObject *obj, Bool_t check);
Bool_t CheckFiltered(TGListTreeItem *item, Bool_t but = kFALSE); Bool_t CheckFiltered(TGListTreeItem *item, Bool_t but = kFALSE);
void CheckRemote(TGListTreeItem *item); void CheckRemote(TGListTreeItem *item);
Bool_t CheckSorted(TGListTreeItem *item, Bool_t but = kFALSE); Bool_t CheckSorted(TGListTreeItem *item, Bool_t = kFALSE);
void Clicked(TGListTreeItem *item, Int_t btn, Int_t x, Int_t y); void Clicked(TGListTreeItem *item, Int_t btn, Int_t x, Int_t y);
TString DirName(TGListTreeItem* item); TString DirName(TGListTreeItem* item);
TString FullPathName(TGListTreeItem* item); TString FullPathName(TGListTreeItem* item);
......
...@@ -218,6 +218,8 @@ void CXGammaSearch::FindGammaRays(Bool_t Bash) ...@@ -218,6 +218,8 @@ void CXGammaSearch::FindGammaRays(Bool_t Bash)
CXNucleus Nuc(iz,ia); CXNucleus Nuc(iz,ia);
TString MajName = Nuc.GetSymbol(); TString MajName = Nuc.GetSymbol();
MajName.ToUpper(); MajName.ToUpper();
MajName.Append("NoVerbose");
TString FileName = fDataBaseFolder + "/" + ((TString)Nuc.GetSymbol()) + ".ens"; TString FileName = fDataBaseFolder + "/" + ((TString)Nuc.GetSymbol()) + ".ens";
...@@ -271,7 +273,7 @@ void CXGammaSearch::FindGammaRays(Bool_t Bash) ...@@ -271,7 +273,7 @@ void CXGammaSearch::FindGammaRays(Bool_t Bash)
std::vector< GammaTransition > avect; std::vector< GammaTransition > avect;
for(int ig=0 ; ig<GoodGammas.size() ; ig++) for(size_t ig=0 ; ig<GoodGammas.size() ; ig++)
{ {
GammaTransition agammatrans; GammaTransition agammatrans;
...@@ -385,7 +387,7 @@ void CXGammaSearch::FindInDoubleCoincidence(Bool_t Bash) ...@@ -385,7 +387,7 @@ void CXGammaSearch::FindInDoubleCoincidence(Bool_t Bash)
//get the coordinates of the gammas //get the coordinates of the gammas
for(Int_t ig=0 ; ig<Dim_LS ; ig++) for(Int_t ig=0 ; ig<Dim_LS ; ig++)
{ {
for(int j=0 ; j<avec.size() ; j++) for(size_t j=0 ; j<avec.size() ; j++)
{ {
GammaTransition GT = avec[j]; GammaTransition GT = avec[j];
...@@ -531,7 +533,7 @@ void CXGammaSearch::FindInTripleCoincidence() ...@@ -531,7 +533,7 @@ void CXGammaSearch::FindInTripleCoincidence()
//get the coordinates of the gammas //get the coordinates of the gammas
for(Int_t ig=0 ; ig<Dim_LS ; ig++) for(Int_t ig=0 ; ig<Dim_LS ; ig++)
{ {
for(int j=0 ; j<avec.size() ; j++) for(size_t j=0 ; j<avec.size() ; j++)
{ {
GammaTransition GT = avec[j]; GammaTransition GT = avec[j];
...@@ -764,6 +766,7 @@ LevelScheme *CXGammaSearch::ImportRAWENSDF(const char *NucSymbol) ...@@ -764,6 +766,7 @@ LevelScheme *CXGammaSearch::ImportRAWENSDF(const char *NucSymbol)
CXNucleus nuc(NucSymbol); CXNucleus nuc(NucSymbol);
TString ZMaj = ((TString)nuc.GetSymbol()); TString ZMaj = ((TString)nuc.GetSymbol());
ZMaj.ToUpper(); ZMaj.ToUpper();
ZMaj.Append("NoVerbose");
TString FileName = fDataBaseFolder + "/" + ((TString)nuc.GetSymbol().Data()) + ".ens"; TString FileName = fDataBaseFolder + "/" + ((TString)nuc.GetSymbol().Data()) + ".ens";
...@@ -874,9 +877,15 @@ TString CXGammaSearch::GetSpinFromLev(NuclearLevel *nuclev) ...@@ -874,9 +877,15 @@ TString CXGammaSearch::GetSpinFromLev(NuclearLevel *nuclev)
else else
Lev = Form("%d%s",SL.Atoi(),PL.Data()); Lev = Form("%d%s",SL.Atoi(),PL.Data());
if(nuclev->GetSpin().IsData(InfoData::kUnknown))
Lev="?";
else if(nuclev->GetSpin().IsData(InfoData::kTentative))
Lev.Append(")").Prepend("(");
return Lev; return Lev;
} }
ClassImp(CXGammaSearch); ClassImp(CXGammaSearch);
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "TMath.h" #include "TMath.h"
#include "TROOT.h" #include "TROOT.h"
#include "TH1.h" #include "TH1.h"
#include "TVirtualX.h"
using namespace std; using namespace std;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "TStyle.h" #include "TStyle.h"
#include "TCanvas.h" #include "TCanvas.h"
#include "TMultiGraph.h" #include "TMultiGraph.h"
#include "TObjString.h"
using namespace std; using namespace std;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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