Skip to content

Update to latest key4hep workflow #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmadlener merged 6 commits into from
Jun 3, 2025
Merged

Update to latest key4hep workflow #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee596e9
Update to latest key4hep workflow
tmadlener Jun 3, 2025
1da883b
Fix warnings
tmadlener Jun 3, 2025
2923554
Try to fix build on gcc11
tmadlener Jun 3, 2025
7e2f848
Better fix for some shadowing warnings
tmadlener Jun 3, 2025
d2a8853
Fix build for c++17
tmadlener Jun 3, 2025
e391a41
Clarify comment
tmadlener Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions .github/workflows/key4hep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
name: keyh4ep
on: [push, pull_request]
name: key4hep
on:
push:
branches:
- main
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-and-test:
runs-on: ubuntu-latest
build:
strategy:
matrix:
build_type: ["release", "nightly"]
image: ["alma9", "ubuntu22"]
image: ["alma9"]
stack: ["key4hep"]
include:
- build_type: nightly
image: ubuntu24
stack: key4hep
fail-fast: false

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: key4hep/key4hep-actions/cache-external-data@main
- uses: key4hep/key4hep-actions/key4hep-build@main
with:
build_type: ${{ matrix.build_type }}
image: ${{ matrix.image }}
stack: ${{ matrix.stack }}
88 changes: 48 additions & 40 deletions include/ced_menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,20 +317,20 @@ class CED_SubSubMenu{
}


bool isAktive;
string title;
int optionNr;
bool isExtend;
bool isMouseOver;
int x_start;
int x_end;
int y_start;
int y_end;

bool dead;
bool isAktive{};
string title{};
int optionNr{};
bool isExtend{};
bool isMouseOver{};
int x_start{};
int x_end{};
int y_start{};
int y_end{};

bool dead{};

private:
vector<CED_SubSubMenu *> subsubMenus;
vector<CED_SubSubMenu *> subsubMenus{};
};


Expand Down Expand Up @@ -483,21 +483,25 @@ class CED_SubMenu{
}
}

CED_SubMenu(const CED_SubMenu&) = delete;
CED_SubMenu& operator=(const CED_SubMenu&) = delete;
CED_SubMenu(CED_SubMenu&&) = default;
CED_SubMenu& operator=(CED_SubMenu&&) = default;


string title;
int optionNr;
bool isExtend;
bool isMouseOver;
int x_start;
int x_end;
int y_start;
int y_end;
string title{};
int optionNr{};
bool isExtend{};
bool isMouseOver{};
int x_start{};
int x_end{};
int y_start{};
int y_end{};


private:
CED_SubSubMenu *selected_submenu;
vector<CED_SubSubMenu *> subsubMenus;
CED_SubSubMenu *selected_submenu{};
vector<CED_SubSubMenu *> subsubMenus{};
};

class CED_Menu{
Expand Down Expand Up @@ -644,8 +648,8 @@ class CED_Menu{
}

private:
vector<CED_SubMenu *> subMenus;
unsigned x_offset;
vector<CED_SubMenu *> subMenus{};
unsigned x_offset{};
};

class CED_PopUpMenu{
Expand All @@ -671,8 +675,7 @@ class CED_PopUpMenu{


unsigned maxlength=title.length();
unsigned i;
for(i=0;(unsigned) i<subsubMenus.size();i++){
for(unsigned i=0u; i<subsubMenus.size();i++){
if(subsubMenus.at(i)->title.length() > maxlength){
maxlength=subsubMenus.at(i)->title.length();
}
Expand Down Expand Up @@ -727,8 +730,7 @@ class CED_PopUpMenu{
//selected_submenu->mouseOver();
}

unsigned i;
for(i=0;(unsigned) i<subsubMenus.size();i++){
for(unsigned i=0u; i<subsubMenus.size();i++){
subsubMenus.at(i)->x_start=x_start;
subsubMenus.at(i)->x_end =x_end;
subsubMenus.at(i)->y_start=y_start/*+height */+1+height*i;
Expand Down Expand Up @@ -817,23 +819,29 @@ class CED_PopUpMenu{
//click_y=
}

CED_PopUpMenu(const CED_PopUpMenu&) = delete;
CED_PopUpMenu& operator=(const CED_PopUpMenu&) = delete;
CED_PopUpMenu(CED_PopUpMenu&&) = default;
CED_PopUpMenu& operator=(CED_PopUpMenu&&) = default;


int size(void){
return(subsubMenus.size());
}
string title;
int optionNr;
bool isExtend;
bool isMouseOver;
int x_start;
int x_end;
int y_start;
int y_end;
int x_click;
int y_click;
string title{};
int optionNr{};
bool isExtend{};
bool isMouseOver{};
int x_start{};
int x_end{};
int y_start{};
int y_end{};
int x_click{};
int y_click{};

private:
vector<CED_SubSubMenu *> subsubMenus;
CED_SubSubMenu *selected_submenu;
vector<CED_SubSubMenu *> subsubMenus{};
CED_SubSubMenu *selected_submenu{};

};

Expand Down
71 changes: 37 additions & 34 deletions src/server/ced_srv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extern int selected_layer;
//#define IS_VISIBLE(x) ((1<<((x>>8)&0xff))&ced_visible_layers)
//#define IS_VISIBLE(x) ((x < (CED_MAX_LAYER-1) && x >= 0)?ced_visible_layers[x]:false)

#define IS_VISIBLE(x) ((x < (CED_MAX_LAYER-1) && x >= 0)?setting.layer[x]:false)
#define IS_VISIBLE(x) ((x < (CED_MAX_LAYER-1) && (int)x >= 0)?setting.layer[x]:false)


/*
Expand Down Expand Up @@ -426,15 +426,15 @@ void drawPartialLineCylinder(double length, double R /*radius*/, double iR /*inn
double phi2=360.0/edges*(i-1);

if(360.0-phi <= angle_cut_off){
double x = cos(2*PI/edges/2)/cos((360.0- (phi-360.0/edges/2)-angle_cut_off)*2*PI/360.0);
double xx = cos(2*PI/edges/2)/cos((360.0- (phi-360.0/edges/2)-angle_cut_off)*2*PI/360.0);

if(outer_face){
//outer
glBegin(GL_LINE_LOOP);
glVertex3d(R*sin(phi2*2*PI/360.0), R*cos(phi2*2*PI/360.0),-length/2);
glVertex3d(R*sin(phi2*2*PI/360.0), R*cos(phi2*2*PI/360.0),length/2);
glVertex3d(R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0), length/2);
glVertex3d(R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0), -length/2);
glVertex3d(R*xx*sin((360.0-angle_cut_off)*2*PI/360.0), R*xx*cos((360.0-angle_cut_off)*2*PI/360.0), length/2);
glVertex3d(R*xx*sin((360.0-angle_cut_off)*2*PI/360.0), R*xx*cos((360.0-angle_cut_off)*2*PI/360.0), -length/2);
glEnd();
}

Expand All @@ -444,8 +444,8 @@ void drawPartialLineCylinder(double length, double R /*radius*/, double iR /*inn
glBegin(GL_LINE_LOOP);
glVertex3d(iR*sin(phi2*2*PI/360.0), iR*cos(phi2*2*PI/360.0),-length/2);
glVertex3d(iR*sin(phi2*2*PI/360.0), iR*cos(phi2*2*PI/360.0),length/2);
glVertex3d(iR*x*sin((360.0-angle_cut_off)*2*PI/360.0), iR*x*cos((360.0-angle_cut_off)*2*PI/360.0), length/2);
glVertex3d(iR*x*sin((360.0-angle_cut_off)*2*PI/360.0), iR*x*cos((360.0-angle_cut_off)*2*PI/360.0), -length/2);
glVertex3d(iR*xx*sin((360.0-angle_cut_off)*2*PI/360.0), iR*xx*cos((360.0-angle_cut_off)*2*PI/360.0), length/2);
glVertex3d(iR*xx*sin((360.0-angle_cut_off)*2*PI/360.0), iR*xx*cos((360.0-angle_cut_off)*2*PI/360.0), -length/2);
glEnd();
}
}
Expand Down Expand Up @@ -490,9 +490,12 @@ void drawPartialLineCylinder(double length, double R /*radius*/, double iR /*inn
*/

struct my_point {
double x;
double y;
};
// Constructor from two doubles which is necessary for c++17
constexpr my_point(double xx, double yy) : x(xx), y(yy) {}

double x;
double y;
};

struct T {double a; int b;};

Expand Down Expand Up @@ -667,15 +670,15 @@ void drawPartialCylinder(double length, double R /*radius*/, double iR /*inner r
double phi2=360.0/edges*(i-1);

if(360.0-phi <= angle_cut_off){
double x = cos(2*PI/edges/2)/cos((360.0- (phi-360.0/edges/2)-angle_cut_off)*2*PI/360.0);
double xx = cos(2*PI/edges/2)/cos((360.0- (phi-360.0/edges/2)-angle_cut_off)*2*PI/360.0);

if(outer_face == true){
//outer

struct point3d p1 = {R*sin(phi2*2*PI/360.0), R*cos(phi2*2*PI/360.0),-length/2};
struct point3d p2 = {R*sin(phi2*2*PI/360.0), R*cos(phi2*2*PI/360.0),length/2};
struct point3d p3 = {R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0), length/2};
struct point3d p4 = {R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0), -length/2};
struct point3d p3 = {R*xx*sin((360.0-angle_cut_off)*2*PI/360.0), R*xx*cos((360.0-angle_cut_off)*2*PI/360.0), length/2};
struct point3d p4 = {R*xx*sin((360.0-angle_cut_off)*2*PI/360.0), R*xx*cos((360.0-angle_cut_off)*2*PI/360.0), -length/2};
struct point3d n;
calNormals(n,p1,p2,p3);

Expand Down Expand Up @@ -894,7 +897,7 @@ void drawPartialCylinder(double length, double R /*radius*/, double iR /*inner r


//inner_side_points.push_back((my_point){iR*sin(360.0/edges*(i)*2*PI/360.0),iR*cos(360.0/edges*(i)*2*PI/360.0)});
inner_side_points.push_back((my_point){iR*xl*sin((angle_cut_off_left)*2*PI/360.0),iR*xl*cos((angle_cut_off_left)*2*PI/360.0)});
inner_side_points.emplace_back(iR*xl*sin((angle_cut_off_left)*2*PI/360.0), iR*xl*cos((angle_cut_off_left)*2*PI/360.0));

i=i+1;

Expand All @@ -903,13 +906,13 @@ void drawPartialCylinder(double length, double R /*radius*/, double iR /*inner r
phi=360.0/edges*i;
if(360.0-phi <= angle_cut_off){
x = cos(2*PI/edges/2)/cos((360.0- (phi-360.0/edges/2)-angle_cut_off)*2*PI/360.0);
inner_side_points.push_back((my_point){iR*sin(360.0/edges*(i-1)*2*PI/360.0), iR*cos(360.0/edges*(i-1)*2*PI/360.0)});
inner_side_points.push_back((my_point){iR*x*sin((360.0-angle_cut_off)*2*PI/360.0), iR*x*cos((360.0-angle_cut_off)*2*PI/360.0)});
inner_side_points.emplace_back(iR*sin(360.0/edges*(i-1)*2*PI/360.0), iR*cos(360.0/edges*(i-1)*2*PI/360.0));
inner_side_points.emplace_back(iR*x*sin((360.0-angle_cut_off)*2*PI/360.0), iR*x*cos((360.0-angle_cut_off)*2*PI/360.0));
break;
}else{
if(i != 0){
inner_side_points.push_back((my_point){iR*sin(360.0/edges*(i-1)*2*PI/360.0), iR*cos(360.0/edges*(i-1)*2*PI/360.0)});
inner_side_points.push_back((my_point){iR*sin(phi*2*PI/360.0), iR*cos(phi*2*PI/360.0)});
inner_side_points.emplace_back(iR*sin(360.0/edges*(i-1)*2*PI/360.0), iR*cos(360.0/edges*(i-1)*2*PI/360.0));
inner_side_points.emplace_back(iR*sin(phi*2*PI/360.0), iR*cos(phi*2*PI/360.0));
}
}
}
Expand All @@ -933,8 +936,8 @@ void drawPartialCylinder(double length, double R /*radius*/, double iR /*inner r



outer_side_points.push_back((my_point){R*xl*sin((angle_cut_off_left)*2*PI/360.0), R*xl*cos(angle_cut_off_left*2*PI/360.0)});
outer_side_points.push_back((my_point){R*sin(360.0/edges*(i)*2*PI/360.0),R*cos(360.0/edges*(i)*2*PI/360.0)});
outer_side_points.emplace_back(R*xl*sin((angle_cut_off_left)*2*PI/360.0), R*xl*cos(angle_cut_off_left*2*PI/360.0));
outer_side_points.emplace_back(R*sin(360.0/edges*(i)*2*PI/360.0),R*cos(360.0/edges*(i)*2*PI/360.0));

i=i+1;

Expand All @@ -944,21 +947,21 @@ void drawPartialCylinder(double length, double R /*radius*/, double iR /*inner r
if(360.0-phi <= angle_cut_off){
x = cos(2*PI/edges/2)/cos((360.0- (phi-360.0/edges/2)-angle_cut_off)*2*PI/360.0);

outer_side_points.push_back((my_point){R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0)});
outer_side_points.emplace_back(R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0));
//outer_side_points.push_back((my_point){R*x*sin((360.0-angle_cut_off)*2*PI/360.0), R*x*cos((360.0-angle_cut_off)*2*PI/360.0)});
break;
}else{
outer_side_points.push_back((my_point){R*sin(phi*2*PI/360.0), R*cos(phi*2*PI/360.0)});
outer_side_points.emplace_back(R*sin(phi*2*PI/360.0), R*cos(phi*2*PI/360.0));
//if(i != 0){
// outer_side_points.push_back((my_point){R*sin(phi*2*PI/360.0), R*cos(phi*2*PI/360.0)});
//}
}
}

for(unsigned int i=0;i<inner_side_points.size();i++){ //transform the points to inner rotate angle
my_point tmp = my_point(inner_side_points[i]);
inner_side_points[i].x=tmp.x*cos(irotate/360*2*PI) - sin(irotate/360*2*PI)*tmp.y;
inner_side_points[i].y=tmp.x*sin(irotate/360*2*PI) + tmp.y*cos(irotate/360.0*2*PI);
for(unsigned int ii=0;ii<inner_side_points.size();ii++){ //transform the points to inner rotate angle
my_point tmp = my_point(inner_side_points[ii]);
inner_side_points[ii].x=tmp.x*cos(irotate/360*2*PI) - sin(irotate/360*2*PI)*tmp.y;
inner_side_points[ii].y=tmp.x*sin(irotate/360*2*PI) + tmp.y*cos(irotate/360.0*2*PI);
}

for(j=0;j<2;j++){ //here do the drawing
Expand Down Expand Up @@ -1213,7 +1216,7 @@ static void renderBitmapString( float x, float y, void *font, char* string) {
* A extra picking function, do the same as ced_get_selected, *
* without center the selected object *
***************************************************************/
int ced_picking(int x,int y,GLfloat *wx,GLfloat *wy,GLfloat *wz){
int ced_picking(int x,int y,GLfloat*, GLfloat*, GLfloat*){
mouse_x=x;
mouse_y=y;

Expand Down Expand Up @@ -1530,7 +1533,7 @@ static void ced_draw_line(CED_Line *h){


static unsigned CED_PICKING_TEXT_ID=0;
static void ced_write_picking_text(CED_PICKING_TEXT *text){
static void ced_write_picking_text(CED_PICKING_TEXT *){
/*
static int biggest_number_picking_text=0;
if(text->id > biggest_number_picking_text){
Expand Down Expand Up @@ -1669,28 +1672,28 @@ static void ced_draw_geotube(CED_GeoTube *c){
}

for(; tmpz <= z0-2*(z0-z1); tmpz+=200){
for(double tmpr=d_i; tmpr < d_o; tmpr+=600){
for(double tmprr=d_i; tmprr < d_o; tmprr+=600){
for(double y=0;y<2*3.14-2*3.14*cut_angle/360.;y+=0.20){
//z0 left end
//z1 middle
//right z0-2*(z0-z1)
CED_Point tmp2;
tmp2.x = tmpr*sin(y);
tmp2.y = tmpr*cos(y);
tmp2.x = tmprr*sin(y);
tmp2.y = tmprr*cos(y);
tmp2.z = tmpz;
ced_add_objmap(&tmp2,20,0,c->type,1 );

}
}

for(double tmpr=d_i+300; tmpr < d_o; tmpr+=600){
for(double tmprr=d_i+300; tmprr < d_o; tmprr+=600){
for(double y=0.1;y<2*3.14-2*3.14*cut_angle/360.;y+=0.20){
//z0 left end
//z1 middle
//right z0-2*(z0-z1)
CED_Point tmp2;
tmp2.x = tmpr*sin(y);
tmp2.y = tmpr*cos(y);
tmp2.x = tmprr*sin(y);
tmp2.y = tmprr*cos(y);
tmp2.z = tmpz;
ced_add_objmap(&tmp2,20,0,c->type,1 );

Expand Down Expand Up @@ -2417,7 +2420,7 @@ static void ced_draw_legend(CED_Legend *legend){
break;
/** LIN */
case 'b':
strncpy( footer, "LIN", 3 );
strncpy( footer, "LIN", 4 );
renderBitmapString(x_min-x_offset_legend,y_min-y_offset_legend, font, footer);
glEnd();
break;
Expand Down
Loading