From 833b4242e764fd4a6b92b60e2fc8bc94918bea52 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 11 Apr 2008 08:58:49 +0000
Subject: [PATCH] move the following directories to "montecarlo":
eg, g4root, pythia6, pythia8, vmc
git-svn-id: http://root.cern.ch/svn/root/trunk@23136 27541ba8-7e3a-0410-8455-c3a389f83636
---
Makefile | 16 ++++++++------
build/unix/makestatic.sh | 9 ++++----
{eg => montecarlo/eg}/Module.mk | 15 +++++++------
{eg => montecarlo/eg}/doc/index.txt | 0
{eg => montecarlo/eg}/inc/Hepevt.h | 0
{eg => montecarlo/eg}/inc/LinkDef.h | 0
{eg => montecarlo/eg}/inc/TAttParticle.h | 0
{eg => montecarlo/eg}/inc/TDatabasePDG.h | 0
{eg => montecarlo/eg}/inc/TDecayChannel.h | 0
{eg => montecarlo/eg}/inc/TGenerator.h | 0
{eg => montecarlo/eg}/inc/TParticle.h | 0
{eg => montecarlo/eg}/inc/TParticleClassPDG.h | 0
{eg => montecarlo/eg}/inc/TParticlePDG.h | 0
{eg => montecarlo/eg}/inc/TPrimary.h | 0
{eg => montecarlo/eg}/inc/TVirtualMCDecayer.h | 0
{eg => montecarlo/eg}/inc/cfortran.h | 0
{eg => montecarlo/eg}/src/TAttParticle.cxx | 0
{eg => montecarlo/eg}/src/TDatabasePDG.cxx | 0
{eg => montecarlo/eg}/src/TDecayChannel.cxx | 0
{eg => montecarlo/eg}/src/TGenerator.cxx | 0
{eg => montecarlo/eg}/src/TParticle.cxx | 0
.../eg}/src/TParticleClassPDG.cxx | 0
{eg => montecarlo/eg}/src/TParticlePDG.cxx | 0
{eg => montecarlo/eg}/src/TPrimary.cxx | 0
.../eg}/src/TVirtualMCDecayer.cxx | 0
{g4root => montecarlo/g4root}/Module.mk | 15 +++++++------
{g4root => montecarlo/g4root}/README | 0
{g4root => montecarlo/g4root}/g4libs.C | 0
{g4root => montecarlo/g4root}/inc/LinkDef.h | 0
.../g4root}/inc/TG4RootDetectorConstruction.h | 0
.../g4root}/inc/TG4RootNavMgr.h | 0
.../g4root}/inc/TG4RootNavigator.h | 0
.../g4root}/inc/TG4RootSolid.h | 0
.../src/TG4RootDetectorConstruction.cxx | 0
.../g4root}/src/TG4RootNavMgr.cxx | 0
.../g4root}/src/TG4RootNavigator.cxx | 0
.../g4root}/src/TG4RootSolid.cxx | 0
.../g4root}/test/drawTracks.C | 0
.../g4root}/test/ex06geom.root | Bin
{g4root => montecarlo/g4root}/test/exN06.in | 0
.../g4root}/test/exN06/Makefile | 0
.../g4root}/test/exN06/exampleN06.cc | 0
.../exN06/include/ExN06PostDetConstruction.hh | 0
.../exN06/src/ExN06DetectorConstruction.cc | 0
.../exN06/src/ExN06PostDetConstruction.cc | 0
.../test/exN06/src/ExN06SteppingVerbose.cc | 0
{g4root => montecarlo/g4root}/test/flags.gmk | 0
{g4root => montecarlo/g4root}/test/runtest | 0
{pythia6 => montecarlo/pythia6}/Module.mk | 18 ++++++++++------
{pythia6 => montecarlo/pythia6}/inc/LinkDef.h | 0
.../pythia6}/inc/TMCParticle.h | 0
.../pythia6}/inc/TPythia6.h | 0
.../pythia6}/inc/TPythia6Calls.h | 0
.../pythia6}/inc/TPythia6Decayer.h | 0
.../pythia6}/src/TMCParticle.cxx | 0
.../pythia6}/src/TPythia6.cxx | 0
.../pythia6}/src/TPythia6Decayer.cxx | 0
{pythia8 => montecarlo/pythia8}/Module.mk | 20 +++++++++++-------
{pythia8 => montecarlo/pythia8}/inc/LinkDef.h | 0
.../pythia8}/inc/TPythia8.h | 0
.../pythia8}/src/TPythia8.cxx | 0
{vmc => montecarlo/vmc}/Module.mk | 15 +++++++------
{vmc => montecarlo/vmc}/doc/index.txt | 0
{vmc => montecarlo/vmc}/inc/LinkDef.h | 0
{vmc => montecarlo/vmc}/inc/TGeoMCGeometry.h | 0
{vmc => montecarlo/vmc}/inc/TMCOptical.h | 0
{vmc => montecarlo/vmc}/inc/TMCParticleType.h | 0
{vmc => montecarlo/vmc}/inc/TMCProcess.h | 0
{vmc => montecarlo/vmc}/inc/TMCVerbose.h | 0
{vmc => montecarlo/vmc}/inc/TPDGCode.h | 0
{vmc => montecarlo/vmc}/inc/TVirtualMC.h | 0
.../vmc}/inc/TVirtualMCApplication.h | 0
.../vmc}/inc/TVirtualMCGeometry.h | 0
{vmc => montecarlo/vmc}/inc/TVirtualMCStack.h | 0
.../vmc}/src/TGeoMCGeometry.cxx | 0
{vmc => montecarlo/vmc}/src/TMCVerbose.cxx | 0
{vmc => montecarlo/vmc}/src/TVirtualMC.cxx | 0
.../vmc}/src/TVirtualMCApplication.cxx | 0
.../vmc}/src/TVirtualMCGeometry.cxx | 0
.../vmc}/src/TVirtualMCStack.cxx | 0
80 files changed, 64 insertions(+), 44 deletions(-)
rename {eg => montecarlo/eg}/Module.mk (84%)
rename {eg => montecarlo/eg}/doc/index.txt (100%)
rename {eg => montecarlo/eg}/inc/Hepevt.h (100%)
rename {eg => montecarlo/eg}/inc/LinkDef.h (100%)
rename {eg => montecarlo/eg}/inc/TAttParticle.h (100%)
rename {eg => montecarlo/eg}/inc/TDatabasePDG.h (100%)
rename {eg => montecarlo/eg}/inc/TDecayChannel.h (100%)
rename {eg => montecarlo/eg}/inc/TGenerator.h (100%)
rename {eg => montecarlo/eg}/inc/TParticle.h (100%)
rename {eg => montecarlo/eg}/inc/TParticleClassPDG.h (100%)
rename {eg => montecarlo/eg}/inc/TParticlePDG.h (100%)
rename {eg => montecarlo/eg}/inc/TPrimary.h (100%)
rename {eg => montecarlo/eg}/inc/TVirtualMCDecayer.h (100%)
rename {eg => montecarlo/eg}/inc/cfortran.h (100%)
rename {eg => montecarlo/eg}/src/TAttParticle.cxx (100%)
rename {eg => montecarlo/eg}/src/TDatabasePDG.cxx (100%)
rename {eg => montecarlo/eg}/src/TDecayChannel.cxx (100%)
rename {eg => montecarlo/eg}/src/TGenerator.cxx (100%)
rename {eg => montecarlo/eg}/src/TParticle.cxx (100%)
rename {eg => montecarlo/eg}/src/TParticleClassPDG.cxx (100%)
rename {eg => montecarlo/eg}/src/TParticlePDG.cxx (100%)
rename {eg => montecarlo/eg}/src/TPrimary.cxx (100%)
rename {eg => montecarlo/eg}/src/TVirtualMCDecayer.cxx (100%)
rename {g4root => montecarlo/g4root}/Module.mk (87%)
rename {g4root => montecarlo/g4root}/README (100%)
rename {g4root => montecarlo/g4root}/g4libs.C (100%)
rename {g4root => montecarlo/g4root}/inc/LinkDef.h (100%)
rename {g4root => montecarlo/g4root}/inc/TG4RootDetectorConstruction.h (100%)
rename {g4root => montecarlo/g4root}/inc/TG4RootNavMgr.h (100%)
rename {g4root => montecarlo/g4root}/inc/TG4RootNavigator.h (100%)
rename {g4root => montecarlo/g4root}/inc/TG4RootSolid.h (100%)
rename {g4root => montecarlo/g4root}/src/TG4RootDetectorConstruction.cxx (100%)
rename {g4root => montecarlo/g4root}/src/TG4RootNavMgr.cxx (100%)
rename {g4root => montecarlo/g4root}/src/TG4RootNavigator.cxx (100%)
rename {g4root => montecarlo/g4root}/src/TG4RootSolid.cxx (100%)
rename {g4root => montecarlo/g4root}/test/drawTracks.C (100%)
rename {g4root => montecarlo/g4root}/test/ex06geom.root (100%)
rename {g4root => montecarlo/g4root}/test/exN06.in (100%)
rename {g4root => montecarlo/g4root}/test/exN06/Makefile (100%)
rename {g4root => montecarlo/g4root}/test/exN06/exampleN06.cc (100%)
rename {g4root => montecarlo/g4root}/test/exN06/include/ExN06PostDetConstruction.hh (100%)
rename {g4root => montecarlo/g4root}/test/exN06/src/ExN06DetectorConstruction.cc (100%)
rename {g4root => montecarlo/g4root}/test/exN06/src/ExN06PostDetConstruction.cc (100%)
rename {g4root => montecarlo/g4root}/test/exN06/src/ExN06SteppingVerbose.cc (100%)
rename {g4root => montecarlo/g4root}/test/flags.gmk (100%)
rename {g4root => montecarlo/g4root}/test/runtest (100%)
rename {pythia6 => montecarlo/pythia6}/Module.mk (81%)
rename {pythia6 => montecarlo/pythia6}/inc/LinkDef.h (100%)
rename {pythia6 => montecarlo/pythia6}/inc/TMCParticle.h (100%)
rename {pythia6 => montecarlo/pythia6}/inc/TPythia6.h (100%)
rename {pythia6 => montecarlo/pythia6}/inc/TPythia6Calls.h (100%)
rename {pythia6 => montecarlo/pythia6}/inc/TPythia6Decayer.h (100%)
rename {pythia6 => montecarlo/pythia6}/src/TMCParticle.cxx (100%)
rename {pythia6 => montecarlo/pythia6}/src/TPythia6.cxx (100%)
rename {pythia6 => montecarlo/pythia6}/src/TPythia6Decayer.cxx (100%)
rename {pythia8 => montecarlo/pythia8}/Module.mk (81%)
rename {pythia8 => montecarlo/pythia8}/inc/LinkDef.h (100%)
rename {pythia8 => montecarlo/pythia8}/inc/TPythia8.h (100%)
rename {pythia8 => montecarlo/pythia8}/src/TPythia8.cxx (100%)
rename {vmc => montecarlo/vmc}/Module.mk (84%)
rename {vmc => montecarlo/vmc}/doc/index.txt (100%)
rename {vmc => montecarlo/vmc}/inc/LinkDef.h (100%)
rename {vmc => montecarlo/vmc}/inc/TGeoMCGeometry.h (100%)
rename {vmc => montecarlo/vmc}/inc/TMCOptical.h (100%)
rename {vmc => montecarlo/vmc}/inc/TMCParticleType.h (100%)
rename {vmc => montecarlo/vmc}/inc/TMCProcess.h (100%)
rename {vmc => montecarlo/vmc}/inc/TMCVerbose.h (100%)
rename {vmc => montecarlo/vmc}/inc/TPDGCode.h (100%)
rename {vmc => montecarlo/vmc}/inc/TVirtualMC.h (100%)
rename {vmc => montecarlo/vmc}/inc/TVirtualMCApplication.h (100%)
rename {vmc => montecarlo/vmc}/inc/TVirtualMCGeometry.h (100%)
rename {vmc => montecarlo/vmc}/inc/TVirtualMCStack.h (100%)
rename {vmc => montecarlo/vmc}/src/TGeoMCGeometry.cxx (100%)
rename {vmc => montecarlo/vmc}/src/TMCVerbose.cxx (100%)
rename {vmc => montecarlo/vmc}/src/TVirtualMC.cxx (100%)
rename {vmc => montecarlo/vmc}/src/TVirtualMCApplication.cxx (100%)
rename {vmc => montecarlo/vmc}/src/TVirtualMCGeometry.cxx (100%)
rename {vmc => montecarlo/vmc}/src/TVirtualMCStack.cxx (100%)
diff --git a/Makefile b/Makefile
index 4cc069083a6..d345740894f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,9 @@ MODULES = build cint/cint core/metautils core/pcre core/utils core/base \
core/clib math/matrix core/newdelete \
hist/hist tree/tree freetype graf gpad g3d gui/gui math/minuit \
hist/histpainter tree/treeplayer gui/ged tree/treeviewer \
- math/physics postscript core/rint core/thread html eg \
- geom/geom geom/geompainter vmc \
+ math/physics postscript core/rint core/thread html \
+ montecarlo/eg \
+ geom/geom geom/geompainter montecarlo/vmc \
math/fumili math/mlp math/quadp net/auth gui/guibuilder io/xml \
math/foam math/splot math/smatrix io/sql tmva \
geom/geombuilder hist/spectrum hist/spectrumpainter \
@@ -124,7 +125,7 @@ ifeq ($(BUILDGFAL),yes)
MODULES += io/gfal
endif
ifeq ($(BUILDG4ROOT),yes)
-MODULES += g4root
+MODULES += montecarlo/g4root
endif
ifeq ($(BUILDGLITE),yes)
MODULES += net/glite
@@ -136,10 +137,10 @@ ifeq ($(BUILDASIMAGE),yes)
MODULES += asimage
endif
ifeq ($(BUILDFPYTHIA6),yes)
-MODULES += pythia6
+MODULES += montecarlo/pythia6
endif
ifeq ($(BUILDFPYTHIA8),yes)
-MODULES += pythia8
+MODULES += montecarlo/pythia8
endif
ifeq ($(BUILDFFTW3),yes)
MODULES += math/fftw
@@ -239,7 +240,8 @@ endif
ifneq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),)
MODULES += core/unix core/winnt x11 x11ttf win32gdk gl ftgl \
io/rfio io/castor \
- pythia6 table sql/mysql sql/pgsql sql/sapdb net/srputils x3d \
+ montecarlo/pythia6 montecarlo/pythia8 table \
+ sql/mysql sql/pgsql sql/sapdb net/srputils x3d \
rootx net/rootd io/dcache io/chirp hbook asimage \
net/ldap net/krb5auth net/rpdutils net/globusauth \
bindings/pyroot bindings/ruby io/gfal \
@@ -248,7 +250,7 @@ MODULES += core/unix core/winnt x11 x11ttf win32gdk gl ftgl \
sql/oracle xmlparser math/mathmore cint/reflex cint/cintex \
roofit/roofitcore roofit/roofit \
math/minuit2 net/monalisa math/fftw sql/odbc math/unuran \
- geom/gdml eve g4root net/glite
+ geom/gdml eve montecarlo/g4root net/glite
MODULES := $(sort $(MODULES)) # removes duplicates
endif
diff --git a/build/unix/makestatic.sh b/build/unix/makestatic.sh
index 3626d7d87a9..7c8ab2029ca 100755
--- a/build/unix/makestatic.sh
+++ b/build/unix/makestatic.sh
@@ -19,17 +19,18 @@ PROOFAEXE=bin/proofserva
rm -f $ROOTALIB $ROOTAEXE $PROOFAEXE
-excl="main proof/proofd net/rootd net/xrootd rootx pythia pythia6 \
- sql/mysql sql/pgsql io/rfio sql/sapdb \
+excl="main proof/proofd net/rootd net/xrootd rootx montecarlo/pythia6 \
+ montecarlo/pythia8 sql/mysql sql/pgsql io/rfio sql/sapdb \
hbook core/newdelete table core/utils net/srputils net/krb5auth \
net/globusauth io/chirp io/dcache \
x11ttf net/alien asimage net/ldap qt gui/qtroot math/quadp \
- bindings/pyroot bindings/ruby vmc \
+ bindings/pyroot bindings/ruby montecarlo/vmc \
xmlparser gl roofit/roofit roofit/roofitcore sql/oracle \
net/netx net/auth net/rpdutils math/mathmore \
math/minuit2 io/gfal net/monalisa proof/proofx math/fftw gui/qtgsi \
sql/odbc \
- io/castor math/unuran geom/gdml cint/cint7 g4root eve net/glite"
+ io/castor math/unuran geom/gdml cint/cint7 montecarlo/g4root \
+ eve net/glite"
objs=""
gobjs=""
diff --git a/eg/Module.mk b/montecarlo/eg/Module.mk
similarity index 84%
rename from eg/Module.mk
rename to montecarlo/eg/Module.mk
index 98788334363..c20837bfe99 100644
--- a/eg/Module.mk
+++ b/montecarlo/eg/Module.mk
@@ -3,7 +3,8 @@
#
# Author: Fons Rademakers, 29/2/2000
-MODDIR := eg
+MODNAME := eg
+MODDIR := montecarlo/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
@@ -36,6 +37,8 @@ ALLMAPS += $(EGMAP)
INCLUDEFILES += $(EGDEP)
##### local rules #####
+.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
include/%.h: $(EGDIRI)/%.h
cp $< $@
@@ -52,14 +55,14 @@ $(EGMAP): $(RLIBMAP) $(MAKEFILEDEP) $(EGL)
$(RLIBMAP) -o $(EGMAP) -l $(EGLIB) \
-d $(EGLIBDEPM) -c $(EGL)
-all-eg: $(EGLIB) $(EGMAP)
+all-$(MODNAME): $(EGLIB) $(EGMAP)
-clean-eg:
+clean-$(MODNAME):
@rm -f $(EGO) $(EGDO)
-clean:: clean-eg
+clean:: clean-$(MODNAME)
-distclean-eg: clean-eg
+distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(EGDEP) $(EGDS) $(EGDH) $(EGLIB) $(EGMAP)
-distclean:: distclean-eg
+distclean:: distclean-$(MODNAME)
diff --git a/eg/doc/index.txt b/montecarlo/eg/doc/index.txt
similarity index 100%
rename from eg/doc/index.txt
rename to montecarlo/eg/doc/index.txt
diff --git a/eg/inc/Hepevt.h b/montecarlo/eg/inc/Hepevt.h
similarity index 100%
rename from eg/inc/Hepevt.h
rename to montecarlo/eg/inc/Hepevt.h
diff --git a/eg/inc/LinkDef.h b/montecarlo/eg/inc/LinkDef.h
similarity index 100%
rename from eg/inc/LinkDef.h
rename to montecarlo/eg/inc/LinkDef.h
diff --git a/eg/inc/TAttParticle.h b/montecarlo/eg/inc/TAttParticle.h
similarity index 100%
rename from eg/inc/TAttParticle.h
rename to montecarlo/eg/inc/TAttParticle.h
diff --git a/eg/inc/TDatabasePDG.h b/montecarlo/eg/inc/TDatabasePDG.h
similarity index 100%
rename from eg/inc/TDatabasePDG.h
rename to montecarlo/eg/inc/TDatabasePDG.h
diff --git a/eg/inc/TDecayChannel.h b/montecarlo/eg/inc/TDecayChannel.h
similarity index 100%
rename from eg/inc/TDecayChannel.h
rename to montecarlo/eg/inc/TDecayChannel.h
diff --git a/eg/inc/TGenerator.h b/montecarlo/eg/inc/TGenerator.h
similarity index 100%
rename from eg/inc/TGenerator.h
rename to montecarlo/eg/inc/TGenerator.h
diff --git a/eg/inc/TParticle.h b/montecarlo/eg/inc/TParticle.h
similarity index 100%
rename from eg/inc/TParticle.h
rename to montecarlo/eg/inc/TParticle.h
diff --git a/eg/inc/TParticleClassPDG.h b/montecarlo/eg/inc/TParticleClassPDG.h
similarity index 100%
rename from eg/inc/TParticleClassPDG.h
rename to montecarlo/eg/inc/TParticleClassPDG.h
diff --git a/eg/inc/TParticlePDG.h b/montecarlo/eg/inc/TParticlePDG.h
similarity index 100%
rename from eg/inc/TParticlePDG.h
rename to montecarlo/eg/inc/TParticlePDG.h
diff --git a/eg/inc/TPrimary.h b/montecarlo/eg/inc/TPrimary.h
similarity index 100%
rename from eg/inc/TPrimary.h
rename to montecarlo/eg/inc/TPrimary.h
diff --git a/eg/inc/TVirtualMCDecayer.h b/montecarlo/eg/inc/TVirtualMCDecayer.h
similarity index 100%
rename from eg/inc/TVirtualMCDecayer.h
rename to montecarlo/eg/inc/TVirtualMCDecayer.h
diff --git a/eg/inc/cfortran.h b/montecarlo/eg/inc/cfortran.h
similarity index 100%
rename from eg/inc/cfortran.h
rename to montecarlo/eg/inc/cfortran.h
diff --git a/eg/src/TAttParticle.cxx b/montecarlo/eg/src/TAttParticle.cxx
similarity index 100%
rename from eg/src/TAttParticle.cxx
rename to montecarlo/eg/src/TAttParticle.cxx
diff --git a/eg/src/TDatabasePDG.cxx b/montecarlo/eg/src/TDatabasePDG.cxx
similarity index 100%
rename from eg/src/TDatabasePDG.cxx
rename to montecarlo/eg/src/TDatabasePDG.cxx
diff --git a/eg/src/TDecayChannel.cxx b/montecarlo/eg/src/TDecayChannel.cxx
similarity index 100%
rename from eg/src/TDecayChannel.cxx
rename to montecarlo/eg/src/TDecayChannel.cxx
diff --git a/eg/src/TGenerator.cxx b/montecarlo/eg/src/TGenerator.cxx
similarity index 100%
rename from eg/src/TGenerator.cxx
rename to montecarlo/eg/src/TGenerator.cxx
diff --git a/eg/src/TParticle.cxx b/montecarlo/eg/src/TParticle.cxx
similarity index 100%
rename from eg/src/TParticle.cxx
rename to montecarlo/eg/src/TParticle.cxx
diff --git a/eg/src/TParticleClassPDG.cxx b/montecarlo/eg/src/TParticleClassPDG.cxx
similarity index 100%
rename from eg/src/TParticleClassPDG.cxx
rename to montecarlo/eg/src/TParticleClassPDG.cxx
diff --git a/eg/src/TParticlePDG.cxx b/montecarlo/eg/src/TParticlePDG.cxx
similarity index 100%
rename from eg/src/TParticlePDG.cxx
rename to montecarlo/eg/src/TParticlePDG.cxx
diff --git a/eg/src/TPrimary.cxx b/montecarlo/eg/src/TPrimary.cxx
similarity index 100%
rename from eg/src/TPrimary.cxx
rename to montecarlo/eg/src/TPrimary.cxx
diff --git a/eg/src/TVirtualMCDecayer.cxx b/montecarlo/eg/src/TVirtualMCDecayer.cxx
similarity index 100%
rename from eg/src/TVirtualMCDecayer.cxx
rename to montecarlo/eg/src/TVirtualMCDecayer.cxx
diff --git a/g4root/Module.mk b/montecarlo/g4root/Module.mk
similarity index 87%
rename from g4root/Module.mk
rename to montecarlo/g4root/Module.mk
index 0f7b72bcd48..7870e5eb721 100644
--- a/g4root/Module.mk
+++ b/montecarlo/g4root/Module.mk
@@ -3,7 +3,8 @@
#
# Author: Andrei Gheata, 08/08/2006
-MODDIR := g4root
+MODNAME := g4root
+MODDIR := montecarlo/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
@@ -45,6 +46,8 @@ ALLMAPS += $(G4ROOTMAP)
INCLUDEFILES += $(G4ROOTDEP)
##### local rules #####
+.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
include/%.h: $(G4ROOTDIRI)/%.h
cp $< $@
@@ -62,17 +65,17 @@ $(G4ROOTMAP): $(RLIBMAP) $(MAKEFILEDEP) $(G4ROOTL)
$(RLIBMAP) -o $(G4ROOTMAP) -l $(G4ROOTLIB) \
-d $(G4ROOTLIBDEPM) -c $(G4ROOTL)
-all-g4root: $(G4ROOTLIB) $(G4ROOTMAP)
+all-$(MODNAME): $(G4ROOTLIB) $(G4ROOTMAP)
-clean-g4root:
+clean-$(MODNAME):
@rm -f $(G4ROOTO) $(G4ROOTDO)
-clean:: clean-g4root
+clean:: clean-$(MODNAME)
-distclean-g4root: clean-g4root
+distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(G4ROOTDEP) $(G4ROOTDS) $(G4ROOTDH) $(G4ROOTLIB) $(G4ROOTMAP)
-distclean:: distclean-g4root
+distclean:: distclean-$(MODNAME)
##### extra rules ######
$(G4ROOTO): CXXFLAGS += $(G4INCDIR:%=-I%) $(CLHEPINCDIR:%=-I%)
diff --git a/g4root/README b/montecarlo/g4root/README
similarity index 100%
rename from g4root/README
rename to montecarlo/g4root/README
diff --git a/g4root/g4libs.C b/montecarlo/g4root/g4libs.C
similarity index 100%
rename from g4root/g4libs.C
rename to montecarlo/g4root/g4libs.C
diff --git a/g4root/inc/LinkDef.h b/montecarlo/g4root/inc/LinkDef.h
similarity index 100%
rename from g4root/inc/LinkDef.h
rename to montecarlo/g4root/inc/LinkDef.h
diff --git a/g4root/inc/TG4RootDetectorConstruction.h b/montecarlo/g4root/inc/TG4RootDetectorConstruction.h
similarity index 100%
rename from g4root/inc/TG4RootDetectorConstruction.h
rename to montecarlo/g4root/inc/TG4RootDetectorConstruction.h
diff --git a/g4root/inc/TG4RootNavMgr.h b/montecarlo/g4root/inc/TG4RootNavMgr.h
similarity index 100%
rename from g4root/inc/TG4RootNavMgr.h
rename to montecarlo/g4root/inc/TG4RootNavMgr.h
diff --git a/g4root/inc/TG4RootNavigator.h b/montecarlo/g4root/inc/TG4RootNavigator.h
similarity index 100%
rename from g4root/inc/TG4RootNavigator.h
rename to montecarlo/g4root/inc/TG4RootNavigator.h
diff --git a/g4root/inc/TG4RootSolid.h b/montecarlo/g4root/inc/TG4RootSolid.h
similarity index 100%
rename from g4root/inc/TG4RootSolid.h
rename to montecarlo/g4root/inc/TG4RootSolid.h
diff --git a/g4root/src/TG4RootDetectorConstruction.cxx b/montecarlo/g4root/src/TG4RootDetectorConstruction.cxx
similarity index 100%
rename from g4root/src/TG4RootDetectorConstruction.cxx
rename to montecarlo/g4root/src/TG4RootDetectorConstruction.cxx
diff --git a/g4root/src/TG4RootNavMgr.cxx b/montecarlo/g4root/src/TG4RootNavMgr.cxx
similarity index 100%
rename from g4root/src/TG4RootNavMgr.cxx
rename to montecarlo/g4root/src/TG4RootNavMgr.cxx
diff --git a/g4root/src/TG4RootNavigator.cxx b/montecarlo/g4root/src/TG4RootNavigator.cxx
similarity index 100%
rename from g4root/src/TG4RootNavigator.cxx
rename to montecarlo/g4root/src/TG4RootNavigator.cxx
diff --git a/g4root/src/TG4RootSolid.cxx b/montecarlo/g4root/src/TG4RootSolid.cxx
similarity index 100%
rename from g4root/src/TG4RootSolid.cxx
rename to montecarlo/g4root/src/TG4RootSolid.cxx
diff --git a/g4root/test/drawTracks.C b/montecarlo/g4root/test/drawTracks.C
similarity index 100%
rename from g4root/test/drawTracks.C
rename to montecarlo/g4root/test/drawTracks.C
diff --git a/g4root/test/ex06geom.root b/montecarlo/g4root/test/ex06geom.root
similarity index 100%
rename from g4root/test/ex06geom.root
rename to montecarlo/g4root/test/ex06geom.root
diff --git a/g4root/test/exN06.in b/montecarlo/g4root/test/exN06.in
similarity index 100%
rename from g4root/test/exN06.in
rename to montecarlo/g4root/test/exN06.in
diff --git a/g4root/test/exN06/Makefile b/montecarlo/g4root/test/exN06/Makefile
similarity index 100%
rename from g4root/test/exN06/Makefile
rename to montecarlo/g4root/test/exN06/Makefile
diff --git a/g4root/test/exN06/exampleN06.cc b/montecarlo/g4root/test/exN06/exampleN06.cc
similarity index 100%
rename from g4root/test/exN06/exampleN06.cc
rename to montecarlo/g4root/test/exN06/exampleN06.cc
diff --git a/g4root/test/exN06/include/ExN06PostDetConstruction.hh b/montecarlo/g4root/test/exN06/include/ExN06PostDetConstruction.hh
similarity index 100%
rename from g4root/test/exN06/include/ExN06PostDetConstruction.hh
rename to montecarlo/g4root/test/exN06/include/ExN06PostDetConstruction.hh
diff --git a/g4root/test/exN06/src/ExN06DetectorConstruction.cc b/montecarlo/g4root/test/exN06/src/ExN06DetectorConstruction.cc
similarity index 100%
rename from g4root/test/exN06/src/ExN06DetectorConstruction.cc
rename to montecarlo/g4root/test/exN06/src/ExN06DetectorConstruction.cc
diff --git a/g4root/test/exN06/src/ExN06PostDetConstruction.cc b/montecarlo/g4root/test/exN06/src/ExN06PostDetConstruction.cc
similarity index 100%
rename from g4root/test/exN06/src/ExN06PostDetConstruction.cc
rename to montecarlo/g4root/test/exN06/src/ExN06PostDetConstruction.cc
diff --git a/g4root/test/exN06/src/ExN06SteppingVerbose.cc b/montecarlo/g4root/test/exN06/src/ExN06SteppingVerbose.cc
similarity index 100%
rename from g4root/test/exN06/src/ExN06SteppingVerbose.cc
rename to montecarlo/g4root/test/exN06/src/ExN06SteppingVerbose.cc
diff --git a/g4root/test/flags.gmk b/montecarlo/g4root/test/flags.gmk
similarity index 100%
rename from g4root/test/flags.gmk
rename to montecarlo/g4root/test/flags.gmk
diff --git a/g4root/test/runtest b/montecarlo/g4root/test/runtest
similarity index 100%
rename from g4root/test/runtest
rename to montecarlo/g4root/test/runtest
diff --git a/pythia6/Module.mk b/montecarlo/pythia6/Module.mk
similarity index 81%
rename from pythia6/Module.mk
rename to montecarlo/pythia6/Module.mk
index 9608f7cf2be..ada81c941eb 100644
--- a/pythia6/Module.mk
+++ b/montecarlo/pythia6/Module.mk
@@ -3,7 +3,8 @@
#
# Author: Fons Rademakers, 29/2/2000
-MODDIR := pythia6
+MODNAME := pythia6
+MODDIR := montecarlo/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
@@ -35,6 +36,8 @@ ALLMAPS += $(PYTHIA6MAP)
INCLUDEFILES += $(PYTHIA6DEP)
##### local rules #####
+.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
include/%.h: $(PYTHIA6DIRI)/%.h
cp $< $@
@@ -52,17 +55,18 @@ $(PYTHIA6MAP): $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA6L)
$(RLIBMAP) -o $(PYTHIA6MAP) -l $(PYTHIA6LIB) \
-d $(PYTHIA6LIBDEPM) -c $(PYTHIA6L)
-all-pythia6: $(PYTHIA6LIB) $(PYTHIA6MAP)
+all-$(MODNAME): $(PYTHIA6LIB) $(PYTHIA6MAP)
-clean-pythia6:
+clean-$(MODNAME):
@rm -f $(PYTHIA6O) $(PYTHIA6DO)
-clean:: clean-pythia6
+clean:: clean-$(MODNAME)
-distclean-pythia6: clean-pythia6
- @rm -f $(PYTHIA6DEP) $(PYTHIA6DS) $(PYTHIA6DH) $(PYTHIA6LIB) $(PYTHIA6MAP)
+distclean-$(MODNAME): clean-$(MODNAME)
+ @rm -f $(PYTHIA6DEP) $(PYTHIA6DS) $(PYTHIA6DH) \
+ $(PYTHIA6LIB) $(PYTHIA6MAP)
-distclean:: distclean-pythia6
+distclean:: distclean-$(MODNAME)
##### extra rules ######
$(PYTHIA6O): CXXFLAGS += $(FPYTHIA6CPPFLAGS)
diff --git a/pythia6/inc/LinkDef.h b/montecarlo/pythia6/inc/LinkDef.h
similarity index 100%
rename from pythia6/inc/LinkDef.h
rename to montecarlo/pythia6/inc/LinkDef.h
diff --git a/pythia6/inc/TMCParticle.h b/montecarlo/pythia6/inc/TMCParticle.h
similarity index 100%
rename from pythia6/inc/TMCParticle.h
rename to montecarlo/pythia6/inc/TMCParticle.h
diff --git a/pythia6/inc/TPythia6.h b/montecarlo/pythia6/inc/TPythia6.h
similarity index 100%
rename from pythia6/inc/TPythia6.h
rename to montecarlo/pythia6/inc/TPythia6.h
diff --git a/pythia6/inc/TPythia6Calls.h b/montecarlo/pythia6/inc/TPythia6Calls.h
similarity index 100%
rename from pythia6/inc/TPythia6Calls.h
rename to montecarlo/pythia6/inc/TPythia6Calls.h
diff --git a/pythia6/inc/TPythia6Decayer.h b/montecarlo/pythia6/inc/TPythia6Decayer.h
similarity index 100%
rename from pythia6/inc/TPythia6Decayer.h
rename to montecarlo/pythia6/inc/TPythia6Decayer.h
diff --git a/pythia6/src/TMCParticle.cxx b/montecarlo/pythia6/src/TMCParticle.cxx
similarity index 100%
rename from pythia6/src/TMCParticle.cxx
rename to montecarlo/pythia6/src/TMCParticle.cxx
diff --git a/pythia6/src/TPythia6.cxx b/montecarlo/pythia6/src/TPythia6.cxx
similarity index 100%
rename from pythia6/src/TPythia6.cxx
rename to montecarlo/pythia6/src/TPythia6.cxx
diff --git a/pythia6/src/TPythia6Decayer.cxx b/montecarlo/pythia6/src/TPythia6Decayer.cxx
similarity index 100%
rename from pythia6/src/TPythia6Decayer.cxx
rename to montecarlo/pythia6/src/TPythia6Decayer.cxx
diff --git a/pythia8/Module.mk b/montecarlo/pythia8/Module.mk
similarity index 81%
rename from pythia8/Module.mk
rename to montecarlo/pythia8/Module.mk
index 5e6d7962594..8b9d23348b3 100644
--- a/pythia8/Module.mk
+++ b/montecarlo/pythia8/Module.mk
@@ -3,7 +3,8 @@
#
# Author: Rene Brun 01/11/2007
-MODDIR := pythia8
+MODNAME := pythia8
+MODDIR := montecarlo/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
@@ -11,7 +12,7 @@ PYTHIA8DIR := $(MODDIR)
PYTHIA8DIRS := $(PYTHIA8DIR)/src
PYTHIA8DIRI := $(PYTHIA8DIR)/inc
-##### libEGPythia6 #####
+##### libEGPythia8 #####
PYTHIA8L := $(MODDIRI)/LinkDef.h
PYTHIA8DS := $(MODDIRS)/G__Pythia8.cxx
PYTHIA8DO := $(PYTHIA8DS:.cxx=.o)
@@ -35,6 +36,8 @@ ALLMAPS += $(PYTHIA8MAP)
INCLUDEFILES += $(PYTHIA8DEP)
##### local rules #####
+.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
include/%.h: $(PYTHIA8DIRI)/%.h
cp $< $@
@@ -52,17 +55,18 @@ $(PYTHIA8MAP): $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L)
$(RLIBMAP) -o $(PYTHIA8MAP) -l $(PYTHIA8LIB) \
-d $(PYTHIA8LIBDEPM) -c $(PYTHIA8L)
-all-pythia8: $(PYTHIA8LIB) $(PYTHIA8MAP)
+all-$(MODNAME): $(PYTHIA8LIB) $(PYTHIA8MAP)
-clean-pythia8:
+clean-$(MODNAME):
@rm -f $(PYTHIA8O) $(PYTHIA8DO)
-clean:: clean-pythia8
+clean:: clean-$(MODNAME)
-distclean-pythia8: clean-pythia8
- @rm -f $(PYTHIA8DEP) $(PYTHIA8DS) $(PYTHIA8DH) $(PYTHIA8LIB) $(PYTHIA8MAP)
+distclean-$(MODNAME): clean-$(MODNAME)
+ @rm -f $(PYTHIA8DEP) $(PYTHIA8DS) $(PYTHIA8DH) \
+ $(PYTHIA8LIB) $(PYTHIA8MAP)
-distclean:: distclean-pythia8
+distclean:: distclean-$(MODNAME)
##### extra rules ######
$(PYTHIA8O): CXXFLAGS += $(FPYTHIA8INCDIR:%=-I%)
diff --git a/pythia8/inc/LinkDef.h b/montecarlo/pythia8/inc/LinkDef.h
similarity index 100%
rename from pythia8/inc/LinkDef.h
rename to montecarlo/pythia8/inc/LinkDef.h
diff --git a/pythia8/inc/TPythia8.h b/montecarlo/pythia8/inc/TPythia8.h
similarity index 100%
rename from pythia8/inc/TPythia8.h
rename to montecarlo/pythia8/inc/TPythia8.h
diff --git a/pythia8/src/TPythia8.cxx b/montecarlo/pythia8/src/TPythia8.cxx
similarity index 100%
rename from pythia8/src/TPythia8.cxx
rename to montecarlo/pythia8/src/TPythia8.cxx
diff --git a/vmc/Module.mk b/montecarlo/vmc/Module.mk
similarity index 84%
rename from vmc/Module.mk
rename to montecarlo/vmc/Module.mk
index acebc1f644d..e6f4c923910 100644
--- a/vmc/Module.mk
+++ b/montecarlo/vmc/Module.mk
@@ -3,7 +3,8 @@
#
# Author: Fons Rademakers, 12/4/2002
-MODDIR := vmc
+MODNAME := vmc
+MODDIR := montecarlo/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
@@ -36,6 +37,8 @@ ALLMAPS += $(VMCMAP)
INCLUDEFILES += $(VMCDEP)
##### local rules #####
+.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
include/%.h: $(VMCDIRI)/%.h
cp $< $@
@@ -52,14 +55,14 @@ $(VMCMAP): $(RLIBMAP) $(MAKEFILEDEP) $(VMCL)
$(RLIBMAP) -o $(VMCMAP) -l $(VMCLIB) \
-d $(VMCLIBDEPM) -c $(VMCL)
-all-vmc: $(VMCLIB) $(VMCMAP)
+all-$(MODNAME): $(VMCLIB) $(VMCMAP)
-clean-vmc:
+clean-$(MODNAME):
@rm -f $(VMCO) $(VMCDO)
-clean:: clean-vmc
+clean:: clean-$(MODNAME)
-distclean-vmc: clean-vmc
+distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(VMCDEP) $(VMCDS) $(VMCDH) $(VMCLIB) $(VMCMAP)
-distclean:: distclean-vmc
+distclean:: distclean-$(MODNAME)
diff --git a/vmc/doc/index.txt b/montecarlo/vmc/doc/index.txt
similarity index 100%
rename from vmc/doc/index.txt
rename to montecarlo/vmc/doc/index.txt
diff --git a/vmc/inc/LinkDef.h b/montecarlo/vmc/inc/LinkDef.h
similarity index 100%
rename from vmc/inc/LinkDef.h
rename to montecarlo/vmc/inc/LinkDef.h
diff --git a/vmc/inc/TGeoMCGeometry.h b/montecarlo/vmc/inc/TGeoMCGeometry.h
similarity index 100%
rename from vmc/inc/TGeoMCGeometry.h
rename to montecarlo/vmc/inc/TGeoMCGeometry.h
diff --git a/vmc/inc/TMCOptical.h b/montecarlo/vmc/inc/TMCOptical.h
similarity index 100%
rename from vmc/inc/TMCOptical.h
rename to montecarlo/vmc/inc/TMCOptical.h
diff --git a/vmc/inc/TMCParticleType.h b/montecarlo/vmc/inc/TMCParticleType.h
similarity index 100%
rename from vmc/inc/TMCParticleType.h
rename to montecarlo/vmc/inc/TMCParticleType.h
diff --git a/vmc/inc/TMCProcess.h b/montecarlo/vmc/inc/TMCProcess.h
similarity index 100%
rename from vmc/inc/TMCProcess.h
rename to montecarlo/vmc/inc/TMCProcess.h
diff --git a/vmc/inc/TMCVerbose.h b/montecarlo/vmc/inc/TMCVerbose.h
similarity index 100%
rename from vmc/inc/TMCVerbose.h
rename to montecarlo/vmc/inc/TMCVerbose.h
diff --git a/vmc/inc/TPDGCode.h b/montecarlo/vmc/inc/TPDGCode.h
similarity index 100%
rename from vmc/inc/TPDGCode.h
rename to montecarlo/vmc/inc/TPDGCode.h
diff --git a/vmc/inc/TVirtualMC.h b/montecarlo/vmc/inc/TVirtualMC.h
similarity index 100%
rename from vmc/inc/TVirtualMC.h
rename to montecarlo/vmc/inc/TVirtualMC.h
diff --git a/vmc/inc/TVirtualMCApplication.h b/montecarlo/vmc/inc/TVirtualMCApplication.h
similarity index 100%
rename from vmc/inc/TVirtualMCApplication.h
rename to montecarlo/vmc/inc/TVirtualMCApplication.h
diff --git a/vmc/inc/TVirtualMCGeometry.h b/montecarlo/vmc/inc/TVirtualMCGeometry.h
similarity index 100%
rename from vmc/inc/TVirtualMCGeometry.h
rename to montecarlo/vmc/inc/TVirtualMCGeometry.h
diff --git a/vmc/inc/TVirtualMCStack.h b/montecarlo/vmc/inc/TVirtualMCStack.h
similarity index 100%
rename from vmc/inc/TVirtualMCStack.h
rename to montecarlo/vmc/inc/TVirtualMCStack.h
diff --git a/vmc/src/TGeoMCGeometry.cxx b/montecarlo/vmc/src/TGeoMCGeometry.cxx
similarity index 100%
rename from vmc/src/TGeoMCGeometry.cxx
rename to montecarlo/vmc/src/TGeoMCGeometry.cxx
diff --git a/vmc/src/TMCVerbose.cxx b/montecarlo/vmc/src/TMCVerbose.cxx
similarity index 100%
rename from vmc/src/TMCVerbose.cxx
rename to montecarlo/vmc/src/TMCVerbose.cxx
diff --git a/vmc/src/TVirtualMC.cxx b/montecarlo/vmc/src/TVirtualMC.cxx
similarity index 100%
rename from vmc/src/TVirtualMC.cxx
rename to montecarlo/vmc/src/TVirtualMC.cxx
diff --git a/vmc/src/TVirtualMCApplication.cxx b/montecarlo/vmc/src/TVirtualMCApplication.cxx
similarity index 100%
rename from vmc/src/TVirtualMCApplication.cxx
rename to montecarlo/vmc/src/TVirtualMCApplication.cxx
diff --git a/vmc/src/TVirtualMCGeometry.cxx b/montecarlo/vmc/src/TVirtualMCGeometry.cxx
similarity index 100%
rename from vmc/src/TVirtualMCGeometry.cxx
rename to montecarlo/vmc/src/TVirtualMCGeometry.cxx
diff --git a/vmc/src/TVirtualMCStack.cxx b/montecarlo/vmc/src/TVirtualMCStack.cxx
similarity index 100%
rename from vmc/src/TVirtualMCStack.cxx
rename to montecarlo/vmc/src/TVirtualMCStack.cxx
--
GitLab