Added ROOT include files in Makefile and corrected trd90y creation.
This commit is contained in:
parent
c84f6a43b3
commit
d5db8dea3b
@ -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
|
||||
|
@ -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];
|
||||
|
Loading…
x
Reference in New Issue
Block a user