From 95e3699b4854c025310dbeb6efdde0b639ac5932 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Mon, 7 Feb 2011 13:30:30 +0000
Subject: [PATCH] * Move NPNucleus, NPReaction and NPEnergyLoss classes in new
Physics directory in NPLib
---
NPLib/Physics/Makefile | 38 +++++++++++++++++++++++
NPLib/{Tools => Physics}/NPEnergyLoss.cxx | 0
NPLib/{Tools => Physics}/NPEnergyLoss.h | 0
NPLib/{Tools => Physics}/NPNucleus.cxx | 4 +--
NPLib/{Tools => Physics}/NPNucleus.h | 0
NPLib/{Tools => Physics}/NPReaction.cxx | 0
NPLib/{Tools => Physics}/NPReaction.h | 0
NPLib/{Tools => Physics}/nubtab03.asc | 0
NPLib/README | 4 +--
NPLib/Tools/Makefile | 14 +--------
NPLib/Tools/TAsciiFile.cxx | 8 +++++
NPLib/Tools/TAsciiFile.h | 3 +-
12 files changed, 52 insertions(+), 19 deletions(-)
create mode 100644 NPLib/Physics/Makefile
rename NPLib/{Tools => Physics}/NPEnergyLoss.cxx (100%)
rename NPLib/{Tools => Physics}/NPEnergyLoss.h (100%)
rename NPLib/{Tools => Physics}/NPNucleus.cxx (98%)
rename NPLib/{Tools => Physics}/NPNucleus.h (100%)
rename NPLib/{Tools => Physics}/NPReaction.cxx (100%)
rename NPLib/{Tools => Physics}/NPReaction.h (100%)
rename NPLib/{Tools => Physics}/nubtab03.asc (100%)
diff --git a/NPLib/Physics/Makefile b/NPLib/Physics/Makefile
new file mode 100644
index 000000000..3df5fe292
--- /dev/null
+++ b/NPLib/Physics/Makefile
@@ -0,0 +1,38 @@
+include ../Makefile.arch
+
+#------------------------------------------------------------------------------
+SHARELIB = libReaction.so libEnergyLoss.so
+all: $(SHARELIB)
+#------------------------------------------------------------------------------
+
+############# Various Tool ############
+
+## Reaction ##
+libReaction.so: NPReaction.o NPNucleus.o
+ $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
+
+## EnergyLoss ##
+libEnergyLoss.so: NPEnergyLoss.o
+ $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
+
+# dependances
+NPReaction.o:NPReaction.cxx NPReaction.h
+NPNucleus.o: NPNucleus.cxx NPNucleus.h
+NPEnergyLoss.o:NPEnergyLoss.cxx NPEnergyLoss.h
+#######################################
+
+############# Clean and More ##########
+clean:
+ @rm -f core *~ *.o *Dict*
+
+distclean:
+ make clean; rm -f *.so
+
+.SUFFIXES: .$(SrcSuf)
+
+###
+
+.$(SrcSuf).$(ObjSuf):
+ $(CXX) $(CXXFLAGS) $(INCLUDE) -c $<
+
+
diff --git a/NPLib/Tools/NPEnergyLoss.cxx b/NPLib/Physics/NPEnergyLoss.cxx
similarity index 100%
rename from NPLib/Tools/NPEnergyLoss.cxx
rename to NPLib/Physics/NPEnergyLoss.cxx
diff --git a/NPLib/Tools/NPEnergyLoss.h b/NPLib/Physics/NPEnergyLoss.h
similarity index 100%
rename from NPLib/Tools/NPEnergyLoss.h
rename to NPLib/Physics/NPEnergyLoss.h
diff --git a/NPLib/Tools/NPNucleus.cxx b/NPLib/Physics/NPNucleus.cxx
similarity index 98%
rename from NPLib/Tools/NPNucleus.cxx
rename to NPLib/Physics/NPNucleus.cxx
index b81f0cbf0..dde3bc218 100644
--- a/NPLib/Tools/NPNucleus.cxx
+++ b/NPLib/Physics/NPNucleus.cxx
@@ -54,7 +54,7 @@ Nucleus::Nucleus(string isotope)
ifstream inFile;
string Path = getenv("NPLIB") ;
- string FileName = Path + "/Tools/nubtab03.asc";
+ string FileName = Path + "/Physics/nubtab03.asc";
inFile.open(FileName.c_str());
// reading the file
@@ -83,7 +83,7 @@ Nucleus::Nucleus(int Z, int A)
// open the file to read and check if it is open
ifstream inFile;
string Path = getenv("NPLIB") ;
- string FileName = Path + "/Tools/nubtab03.asc";
+ string FileName = Path + "/Physics/nubtab03.asc";
inFile.open(FileName.c_str());
// reading the file
diff --git a/NPLib/Tools/NPNucleus.h b/NPLib/Physics/NPNucleus.h
similarity index 100%
rename from NPLib/Tools/NPNucleus.h
rename to NPLib/Physics/NPNucleus.h
diff --git a/NPLib/Tools/NPReaction.cxx b/NPLib/Physics/NPReaction.cxx
similarity index 100%
rename from NPLib/Tools/NPReaction.cxx
rename to NPLib/Physics/NPReaction.cxx
diff --git a/NPLib/Tools/NPReaction.h b/NPLib/Physics/NPReaction.h
similarity index 100%
rename from NPLib/Tools/NPReaction.h
rename to NPLib/Physics/NPReaction.h
diff --git a/NPLib/Tools/nubtab03.asc b/NPLib/Physics/nubtab03.asc
similarity index 100%
rename from NPLib/Tools/nubtab03.asc
rename to NPLib/Physics/nubtab03.asc
diff --git a/NPLib/README b/NPLib/README
index f33290698..e76821d55 100644
--- a/NPLib/README
+++ b/NPLib/README
@@ -26,7 +26,7 @@ NPLib / include
/ lib
/ scripts
/ IORoot
- / Tools
+ / Tools + Physics
/ InitialConditions
/ InteractionCoordinates
/ CalibrationManager
@@ -61,7 +61,7 @@ IV) IORoot
both in NPSimulation and NPAnalysis.
These classes are used to deal with the input and output ROOT files and trees.
-V) Tools
+V) Tools + Physics
VI) InitialConditions
This directory includes one library:
diff --git a/NPLib/Tools/Makefile b/NPLib/Tools/Makefile
index 20ed56ca4..d8a9f4f43 100644
--- a/NPLib/Tools/Makefile
+++ b/NPLib/Tools/Makefile
@@ -1,21 +1,12 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libReaction.so libEnergyLoss.so libTagManager.so libOptionManager.so \
- libAsciiFile.so
+SHARELIB = libTagManager.so libOptionManager.so libAsciiFile.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############# Various Tool ############
-## Reaction ##
-libReaction.so: NPReaction.o NPNucleus.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
-## EnergyLoss ##
-libEnergyLoss.so: NPEnergyLoss.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
## TAGManager ##
libTagManager.so: NPTagManager.o NPTagManagerDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
@@ -35,9 +26,6 @@ TAsciiFileDict.cxx: TAsciiFile.h
rootcint -f $@ -c $^
# dependances
-NPReaction.o:NPReaction.cxx NPReaction.h
-NPNucleus.o: NPNucleus.cxx NPNucleus.h
-NPEnergyLoss.o:NPEnergyLoss.cxx NPEnergyLoss.h
NPTagManager.o:NPTagManager.cxx NPTagManager.h
NPOptionManager.o:NPOptionManager.cxx NPOptionManager.h
TAsciiFile.o: TAsciiFile.cxx TAsciiFile.h
diff --git a/NPLib/Tools/TAsciiFile.cxx b/NPLib/Tools/TAsciiFile.cxx
index b2df7c4ba..e495e1b00 100644
--- a/NPLib/Tools/TAsciiFile.cxx
+++ b/NPLib/Tools/TAsciiFile.cxx
@@ -71,6 +71,14 @@ void TAsciiFile::ReadFile(const char* inputAsciiFile)
+bool TAsciiFile::IsEmpty() const
+{
+ if (fLines.size() == 0) return true;
+ else return false;
+}
+
+
+
void TAsciiFile::Append(const char* inputAsciiFile)
{
ReadFile(inputAsciiFile);
diff --git a/NPLib/Tools/TAsciiFile.h b/NPLib/Tools/TAsciiFile.h
index fb64f0dc2..df9f63f34 100644
--- a/NPLib/Tools/TAsciiFile.h
+++ b/NPLib/Tools/TAsciiFile.h
@@ -50,8 +50,7 @@ class TAsciiFile : public TNamed {
void Print(const Option_t*) const {};
void Print() const;
void Print(UInt_t begin, UInt_t end) const;
- bool IsEmpty () {if (fLines.size()==0) return true;
- else return false ;}
+ bool IsEmpty() const;
ClassDef(TAsciiFile, 1); // Class TAsciiFile for storing ascii text
};
--
GitLab