diff --git a/GNUmakefile b/GNUmakefile index b95e65a..7c134db 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -11,7 +11,7 @@ G4EXLIB := true #LDFLAGS := -L./ ${ROOTLIBS} # Root (exlude libNew and libpthread from library list) -#ROOTINC = -I$(ROOTSYS)/include +ROOTINC = -I$(ROOTSYS)/include ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) -lMinuit -lHtml ROOTLIBS := $(filter-out -lNew,$(ROOTLIBS)) @@ -22,7 +22,7 @@ ROOTLIBS := $(filter-out -lNew,$(ROOTLIBS)) #ROOTLIBS := $(filter-out -pthread,$(ROOTLIBS)) # Extra flags for G4 -#CPPFLAGS += $(ROOTINC) +CPPFLAGS += $(ROOTINC) #LDLIBS += $(ROOTLIBS) EXTRALIBS += $(ROOTLIBS) CPPFLAGS += -g diff --git a/src/musrDetectorConstruction.cc b/src/musrDetectorConstruction.cc index f5ea244..1b1688d 100644 --- a/src/musrDetectorConstruction.cc +++ b/src/musrDetectorConstruction.cc @@ -393,8 +393,8 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() { // For trapezoid "trd90y" rotate the trapezoid by 90 degrees in y direction // (in addition to the requested rotation) - if (strcmp(tmpString2,"trd")==0){ - pRot->rotateY(90.0*deg); + if (strcmp(tmpString2,"trd90y")==0) { + pRot->rotateY(90.0*deg); } G4FieldManager* pFieldMan = pointerToField[actualFieldName];