LMU/musrsim
LMU/musrsim
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ROOT include files in Makefile and corrected trd90y creation.

Browse Source
This commit is contained in:
salman 2010-01-07 15:43:48 +00:00
parent c84f6a43b3
commit d5db8dea3b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -11,7 +11,7 @@ G4EXLIB := true
#LDFLAGS := -L./ ${ROOTLIBS} #LDFLAGS := -L./ ${ROOTLIBS}
# Root (exlude libNew and libpthread from library list) # 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 = $(shell $(ROOTSYS)/bin/root-config --glibs) -lMinuit -lHtml
ROOTLIBS := $(filter-out -lNew,$(ROOTLIBS)) ROOTLIBS := $(filter-out -lNew,$(ROOTLIBS))
@ -22,7 +22,7 @@ ROOTLIBS := $(filter-out -lNew,$(ROOTLIBS))
#ROOTLIBS := $(filter-out -pthread,$(ROOTLIBS)) #ROOTLIBS := $(filter-out -pthread,$(ROOTLIBS))
# Extra flags for G4 # Extra flags for G4
#CPPFLAGS += $(ROOTINC) CPPFLAGS += $(ROOTINC)
#LDLIBS += $(ROOTLIBS) #LDLIBS += $(ROOTLIBS)
EXTRALIBS += $(ROOTLIBS) EXTRALIBS += $(ROOTLIBS)
CPPFLAGS += -g CPPFLAGS += -g

4
src/musrDetectorConstruction.cc
View File

@ -393,8 +393,8 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
// For trapezoid "trd90y" rotate the trapezoid by 90 degrees in y direction // For trapezoid "trd90y" rotate the trapezoid by 90 degrees in y direction
// (in addition to the requested rotation) // (in addition to the requested rotation)
if (strcmp(tmpString2,"trd")==0){ if (strcmp(tmpString2,"trd90y")==0) {
pRot->rotateY(90.0*deg); pRot->rotateY(90.0*deg);
} }
G4FieldManager* pFieldMan = pointerToField[actualFieldName]; G4FieldManager* pFieldMan = pointerToField[actualFieldName];