Skip to content
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

Jump to bottom

Build StRoot/StSpinPool with ROOT6 #63

Merged
merged 2 commits into from
Jul 20, 2021
Merged

Build StRoot/StSpinPool with ROOT6 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff4e306
Include StRoot/StSpinPool in ROOT6 CI build
plexoos Jul 19, 2021
5b85e29
Do not hide code from ROOT6 rootcling
plexoos Jul 13, 2021
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
4 changes: 2 additions & 2 deletions StRoot/StSpinPool/StFmsTriggerMaker/StFmsTriggerMaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class TH2F;

#include <cstring>
#if !defined(__CINT__) && !defined(__CLING__)
#if !defined(__CINT__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: This was originally added in 720f513

#include "Board.hh"
#include "Crate.hh"
#include "bits.hh"
Expand Down Expand Up @@ -131,7 +131,7 @@ class StFmsTriggerMaker : public StMaker {

// Crates
enum { NCRATES = 14 };
#if !defined(__CINT__) && !defined(__CLING__)
#if !defined(__CINT__)

Crate crates[NCRATES];

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.root6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ RUN source star-spack/setup.sh && spack env activate star-env-root6 \
&& cons %pams/sim/g2r %OnlTools \
%StarVMC/GeoTestMaker \
%StRoot/StarGenerator/Kinematics \
%StRoot/StEEmcPool %StRoot/StFgtPool %StRoot/StHighptPool %StRoot/StSpinPool \
%StRoot/StEEmcPool %StRoot/StFgtPool %StRoot/StHighptPool \
%StRoot/StJetFinder \
%StRoot/StShadowMaker %StRoot/StSpinMaker %StRoot/StHbtMaker