Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 1a707e77 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Merge branch 'Cubix' into 'Cubix'

Cubix

See merge request !58
parents 5882a2d2 6d6428b7
Pipeline #83368 passed with stage
in 8 minutes and 14 seconds
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "RQ_OBJECT.h" #include "RQ_OBJECT.h"
#include "CXMainWindow.h" #include "CXMainWindow.h"
#include <array>
class TH2; class TH2;
class TGLabel; class TGLabel;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "CXMainWindow.h" #include "CXMainWindow.h"
#include "CXRadCubeTH1Proj.h" #include "CXRadCubeTH1Proj.h"
#include "CXTH1Proj.h" #include "CXTH1Proj.h"
#include "TVirtualX.h"
using namespace std; using namespace std;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "TCanvas.h" #include "TCanvas.h"
#include "TCutG.h" #include "TCutG.h"
#include "TROOT.h" #include "TROOT.h"
#include "TVirtualX.h"
#include "TH1.h" #include "TH1.h"
#include "TF1.h" #include "TF1.h"
......
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
#include "TBaseClass.h" #include "TBaseClass.h"
#include "RConfigure.h" #include "RConfigure.h"
#include "TVirtualX.h"
#include "TObjString.h"
#ifdef WIN32 #ifdef WIN32
const char rootdir[] = "\\"; const char rootdir[] = "\\";
......
...@@ -273,7 +273,7 @@ void CXGammaSearch::FindGammaRays(Bool_t Bash) ...@@ -273,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;
...@@ -387,7 +387,7 @@ void CXGammaSearch::FindInDoubleCoincidence(Bool_t Bash) ...@@ -387,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];
...@@ -533,7 +533,7 @@ void CXGammaSearch::FindInTripleCoincidence() ...@@ -533,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];
......
...@@ -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;
......
...@@ -261,7 +261,7 @@ void CXGuiLSPlayer::UpdateGammaRays() ...@@ -261,7 +261,7 @@ void CXGuiLSPlayer::UpdateGammaRays()
if(fSelectedLevelScheme) { if(fSelectedLevelScheme) {
if(fNumberOfNuclei == 1) { if(fNumberOfNuclei == 1) {
for(int i=0 ; i< fSelectedLevelScheme->GetDataSets().size() ; i++) { for(size_t i=0 ; i< fSelectedLevelScheme->GetDataSets().size() ; i++) {
fDataSetMode->AddEntry(fSelectedLevelScheme->GetDataSets().at(i).Dsid.data(),i); fDataSetMode->AddEntry(fSelectedLevelScheme->GetDataSets().at(i).Dsid.data(),i);
} }
} }
......
...@@ -111,7 +111,7 @@ void CXHist1DCalib::SetMainWindow(CXMainWindow *w) ...@@ -111,7 +111,7 @@ void CXHist1DCalib::SetMainWindow(CXMainWindow *w)
fMainWindow = w; fMainWindow = w;
} }
void CXHist1DCalib::HandleMouse(Int_t EventType,Int_t EventX,Int_t EventY, TObject* selected) void CXHist1DCalib::HandleMouse(Int_t /*EventType*/,Int_t /*EventX*/,Int_t /*EventY*/, TObject* /*selected*/)
{ {
TPad *pad = dynamic_cast<TPad*>(gROOT->GetSelectedPad()); TPad *pad = dynamic_cast<TPad*>(gROOT->GetSelectedPad());
......
...@@ -17,6 +17,7 @@ class TF1; ...@@ -17,6 +17,7 @@ class TF1;
class TGComboBox; class TGComboBox;
class TGCheckButton; class TGCheckButton;
class CXCanvas; class CXCanvas;
class TCanvas;
class CXHist1DCalib : public TGVerticalFrame class CXHist1DCalib : public TGVerticalFrame
{ {
......
...@@ -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;
......
...@@ -297,7 +297,7 @@ void CXLevelSchemePlayer::DrawArrow(TH1 *hist, const GammaLink *gamma, CXNucleus ...@@ -297,7 +297,7 @@ void CXLevelSchemePlayer::DrawArrow(TH1 *hist, const GammaLink *gamma, CXNucleus
return; return;
Float_t spinI = ((Gw::NuclearLevel*)((GammaLink*)gamma)->GetIL())->GetSpin().Get(); Float_t spinI = ((Gw::NuclearLevel*)((GammaLink*)gamma)->GetIL())->GetSpin().Get();
Float_t spinF = ((Gw::NuclearLevel*)((GammaLink*)gamma)->GetFL())->GetSpin().Get(); // Float_t spinF = ((Gw::NuclearLevel*)((GammaLink*)gamma)->GetFL())->GetSpin().Get();
if(fGuiLSPlayer->UseSpins() && (spinI<fMinSpin || spinI>fMaxSpin)) if(fGuiLSPlayer->UseSpins() && (spinI<fMinSpin || spinI>fMaxSpin))
return; return;
...@@ -882,7 +882,7 @@ TString CXLevelSchemePlayer::GetSpinFromLev(NuclearLevel *nuclev) ...@@ -882,7 +882,7 @@ TString CXLevelSchemePlayer::GetSpinFromLev(NuclearLevel *nuclev)
return Lev; return Lev;
} }
void CXLevelSchemePlayer::ProcessedEventLevelScheme(Int_t eventType, Int_t eventX, Int_t eventY, TObject* obj) void CXLevelSchemePlayer::ProcessedEventLevelScheme(Int_t eventType, Int_t /*eventX*/, Int_t eventY, TObject* obj)
{ {
if( eventType == kKeyPress ) if( eventType == kKeyPress )
{ {
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "TBrowser.h" #include "TBrowser.h"
#include "TClass.h" #include "TClass.h"
#include "TExec.h" #include "TExec.h"
#include "TVirtualX.h"
#include "CXGateBox.h" #include "CXGateBox.h"
#include "CXBgdUtility.h" #include "CXBgdUtility.h"
......
...@@ -128,8 +128,8 @@ void CXNDManager::InitBE2(TString filename) ...@@ -128,8 +128,8 @@ void CXNDManager::InitBE2(TString filename)
NucData *data = GetData(Name); NucData *data = GetData(Name);
if(data == nullptr) continue; if(data == nullptr) continue;
Int_t Z = data->Z; // Int_t Z = data->Z;
Int_t N = data->N; // Int_t N = data->N;
// BE2 E2B2 // BE2 E2B2
Int_t ii=2; Int_t ii=2;
......
...@@ -34,8 +34,8 @@ public: ...@@ -34,8 +34,8 @@ public:
Decays.push_back(pair); Decays.push_back(pair);
// Sort on branching // Sort on branching
for(ushort t=1 ; t<Decays.size() ; t++) for(size_t t=1 ; t<Decays.size() ; t++)
for(int i=0 ; i<Decays.size()-1 ; i++) for(size_t i=0 ; i<Decays.size()-1 ; i++)
if(Decays.at(i).second < Decays.at(i+1).second){ if(Decays.at(i).second < Decays.at(i+1).second){
swap(Decays.at(i),Decays.at(i+1)); swap(Decays.at(i),Decays.at(i+1));
} }
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "CXNucleusBox.h" #include "CXNucleusBox.h"
#include "CXLevelSchemePlayer.h" #include "CXLevelSchemePlayer.h"
#include "CXGuiLSPlayer.h" #include "CXGuiLSPlayer.h"
#include "TVirtualX.h"
using namespace std; using namespace std;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
using namespace std; using namespace std;
CXNucleusBox::CXNucleusBox(NucData *nuc, Double_t size, Int_t colStable, Int_t colRadio, Int_t textsize, bool withlt, Int_t mode) : TBox(nuc->N - size, nuc->Z - size, nuc->N + size, nuc->Z + size) CXNucleusBox::CXNucleusBox(NucData *nuc, Double_t size, Int_t /*colStable*/, Int_t colRadio, Int_t textsize, bool withlt, Int_t mode) : TBox(nuc->N - size, nuc->Z - size, nuc->N + size, nuc->Z + size)
{ {
fZ = nuc->Z; fZ = nuc->Z;
fN = nuc->N; fN = nuc->N;
...@@ -36,7 +36,7 @@ CXNucleusBox::CXNucleusBox(NucData *nuc, Double_t size, Int_t colStable, Int_t c ...@@ -36,7 +36,7 @@ CXNucleusBox::CXNucleusBox(NucData *nuc, Double_t size, Int_t colStable, Int_t c
fText->SetBit(kCannotMove); fText->SetBit(kCannotMove);
fText->SetBit(kCannotPick); fText->SetBit(kCannotPick);
Float_t width = fText->GetXsize(); // Float_t width = fText->GetXsize();
Float_t height = fText->GetYsize(); Float_t height = fText->GetYsize();
// fText->SetX(fText->GetX()-width*0.75); // fText->SetX(fText->GetX()-width*0.75);
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "CXRad2DPlayer.h" #include "CXRad2DPlayer.h"
#include "CXRadCubePlayer.h" #include "CXRadCubePlayer.h"
#include "CXGateBox.h" #include "CXGateBox.h"
#include "TVirtualX.h"
using namespace std; using namespace std;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "TH1D.h" #include "TH1D.h"
#include "TH2D.h" #include "TH2D.h"
#include "TF1.h" #include "TF1.h"
#include "TObjArray.h"
#include "CXMainWindow.h" #include "CXMainWindow.h"
...@@ -2499,7 +2500,7 @@ int CXRadReader::wspec(char *filnam, double *spec, int idim) ...@@ -2499,7 +2500,7 @@ int CXRadReader::wspec(char *filnam, double *spec, int idim)
/* ======================================================================= */ /* ======================================================================= */
FILE *CXRadReader::open_new_file(char *filename, int force_open) FILE *CXRadReader::open_new_file(char *filename, int /*force_open*/)
{ {
/* safely open a new file /* safely open a new file
filename: name of file to be opened filename: name of file to be opened
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <iomanip> #include <iomanip>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <array>
#include "TH2.h" #include "TH2.h"
#include "TCanvas.h" #include "TCanvas.h"
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
#include "CXMainWindow.h" #include "CXMainWindow.h"
#include "CXHist2DPlayer.h" #include "CXHist2DPlayer.h"
#include "CXGateBox.h" #include "CXGateBox.h"
#include "TVirtualX.h"
using namespace std; using namespace std;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "FSMainWindow.h" #include "FSMainWindow.h"
#include "FSPad.h" #include "FSPad.h"
#include "TVirtualX.h"
FSTab::FSTab(const TGWindow *p, TGMainFrame *f) : FSTab::FSTab(const TGWindow *p, TGMainFrame *f) :
TGTab(p) { TGTab(p) {
......
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