diff --git a/NPLib/CATS/Makefile b/NPLib/CATS/Makefile
index 7895a0598a3d8058c719436419c3f936d82cccf7..7ed4129a7acffa58b6755afce79cd3ca281ec8e7 100644
--- a/NPLib/CATS/Makefile
+++ b/NPLib/CATS/Makefile
@@ -1,29 +1,27 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libCATSData.so libCATSPhysics.so
+SHARELIB = libCATS.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
-## CATS ##
-libCATSData.so: TCATSData.o TCATSDataDict.o
+## CATS ##
+libCATS.so: TCATSData.o TCATSDataDict.o TCATSPhysics.o TCATSPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TCATSDataDict.cxx: TCATSData.h
rootcint -f $@ -c $^
-libCATSPhysics.so: TCATSPhysics.o TCATSPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TCATSPhysicsDict.cxx: TCATSPhysics.h
rootcint -f $@ -c $^
# dependances
-TCATSData.o: TCATSData.cxx TCATSData.h
-TCATSDataDict.o: TCATSDataDict.cxx TCATSDataDict.h
-TCATSPhysics.o: TCATSPhysics.cxx TCATSPhysics.h
+TCATSData.o: TCATSData.cxx TCATSData.h
+TCATSDataDict.o: TCATSData.cxx TCATSData.h
+TCATSPhysicsDict.o: TCATSPhysics.cxx TCATSPhysics.h
+TCATSPhysics.o: TCATSPhysics.cxx TCATSPhysics.h
#######################################
############# Clean and More ##########
diff --git a/NPLib/ChateauCristal/Makefile b/NPLib/ChateauCristal/Makefile
index 31eb3779b49b8c6e7f9bb32ed98b4fed95bea5e8..ddb1d12e93953c2a20bcc3f94350e52003ebf5be 100644
--- a/NPLib/ChateauCristal/Makefile
+++ b/NPLib/ChateauCristal/Makefile
@@ -1,29 +1,27 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libChateauCristalData.so libChateauCristalPhysics.so
+SHARELIB = libChateauCristal.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## ChateauCristal ##
-libChateauCristalData.so: TChateauCristalData.o TChateauCristalDataDict.o
+libChateauCristal.so: TChateauCristalData.o TChateauCristalDataDict.o TChateauCristalPhysics.o TChateauCristalPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TChateauCristalDataDict.cxx: TChateauCristalData.h
rootcint -f $@ -c $^
-libChateauCristalPhysics.so: TChateauCristalPhysics.o TChateauCristalPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TChateauCristalPhysicsDict.cxx: TChateauCristalPhysics.h
rootcint -f $@ -c $^
# dependances
-TChateauCristalData.o: TChateauCristalData.cxx TChateauCristalData.h
-TChateauCristalDataDict.o: TChateauCristalDataDict.cxx TChateauCristalDataDict.h
-TChateauCristalPhysics.o: TChateauCristalPhysics.cxx TChateauCristalPhysics.h
+TChateauCristalData.o: TChateauCristalData.cxx TChateauCristalData.h
+TChateauCristalDataDict.o: TChateauCristalData.cxx TChateauCristalData.h
+TChateauCristalPhysicsDict.o: TChateauCristalPhysics.cxx TChateauCristalPhysics.h
+TChateauCristalPhysics.o: TChateauCristalPhysics.cxx TChateauCristalPhysics.h
#######################################
############# Clean and More ##########
diff --git a/NPLib/Chio/Makefile b/NPLib/Chio/Makefile
index 75f9f1d01a441391ab4b90c5faadbbcff44cf04c..60b0fea890e8c757bc14c1e185b460d30d283438 100644
--- a/NPLib/Chio/Makefile
+++ b/NPLib/Chio/Makefile
@@ -1,34 +1,25 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libChio_anData.so libChio_digData.so libChio_anPhysics.so libChio_digPhysics.so
+SHARELIB = libChio.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Chio_an & Chio_dig ##
-libChio_anData.so: TChio_anData.o TChio_anDataDict.o
+libChio.so: TChio_anData.o TChio_anDataDict.o TChio_anPhysics.o TChio_anPhysicsDict.o TChio_digData.o TChio_digDataDict.o TChio_digPhysics.o TChio_digPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TChio_anDataDict.cxx: TChio_anData.h
rootcint -f $@ -c $^
-libChio_anPhysics.so: TChio_anPhysics.o TChio_anPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TChio_anPhysicsDict.cxx: TChio_anPhysics.h
rootcint -f $@ -c $^
-libChio_digData.so: TChio_digData.o TChio_digDataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TChio_digDataDict.cxx: TChio_digData.h
rootcint -f $@ -c $^
-libChio_digPhysics.so: TChio_digPhysics.o TChio_digPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TChio_digPhysicsDict.cxx: TChio_digPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Chio/TChio_anPhysics.cxx b/NPLib/Chio/TChio_anPhysics.cxx
index 2b96e1b7abac17dbe41c35451b11d542e2b0d697..796be00f2a27106573fb9b333dc6c86cec10342a 100644
--- a/NPLib/Chio/TChio_anPhysics.cxx
+++ b/NPLib/Chio/TChio_anPhysics.cxx
@@ -21,7 +21,6 @@
#include "TChio_anPhysics.h"
-using namespace LOCAL_CHIO;
// STL
#include <cmath>
@@ -398,14 +397,14 @@ void TChio_anPhysics::BuildSimplePhysicalEvent()
// deduce amplitude
rawAmplitude.push_back(Energy[peak_stop[pid]]-fdecay->Eval(peak_stop[pid]));
// calibration
- calAmplitude.push_back(CalibRawAmplitude(rawAmplitude[pid]));
+ calAmplitude.push_back(LOCAL_CHIO_AN::CalibRawAmplitude(rawAmplitude[pid]));
}
}
}
*/
}
-namespace LOCAL_CHIO
+namespace LOCAL_CHIO_AN
{
double CalibRawAmplitude(const double rawAmplitude)
{
diff --git a/NPLib/Chio/TChio_anPhysics.h b/NPLib/Chio/TChio_anPhysics.h
index beb3d314d2ccd87d4b00033cd0fad9210717b4a4..7867a03b3a67ce081d11c63c8df45ab3d0fb0dc9 100644
--- a/NPLib/Chio/TChio_anPhysics.h
+++ b/NPLib/Chio/TChio_anPhysics.h
@@ -130,7 +130,7 @@ class TChio_anPhysics : public TObject, public NPA::VDetector
};
-namespace LOCAL_CHIO
+namespace LOCAL_CHIO_AN
{
double CalibRawAmplitude(double);
}
diff --git a/NPLib/Chio/TChio_digPhysics.cxx b/NPLib/Chio/TChio_digPhysics.cxx
index 970698fb35400c92396c65b48a3249ca826efda3..369c42649df8164b6b7a3e8338e22a3140e2d72b 100644
--- a/NPLib/Chio/TChio_digPhysics.cxx
+++ b/NPLib/Chio/TChio_digPhysics.cxx
@@ -21,7 +21,6 @@
#include "TChio_digPhysics.h"
-using namespace LOCAL_CHIO;
// STL
#include <cmath>
@@ -412,7 +411,7 @@ void TChio_digPhysics::BuildSimplePhysicalEvent()
// cout << Energy[peak_stop[pid]] << " "<< fdecay->Eval(peak_stop[pid]) << endl;
rawAmplitude.push_back(-Energy[peak_stop[pid]]+fdecay->Eval(peak_stop[pid]));
// calibration
- calAmplitude.push_back(CalibRawAmplitude(rawAmplitude[pid]));
+ calAmplitude.push_back(LOCAL_CHIO_DIG::CalibRawAmplitude(rawAmplitude[pid]));
}
// }
//}
@@ -421,7 +420,7 @@ void TChio_digPhysics::BuildSimplePhysicalEvent()
}
-namespace LOCAL_CHIO
+namespace LOCAL_CHIO_DIG
{
double CalibRawAmplitude(const double rawAmplitude)
{
diff --git a/NPLib/Chio/TChio_digPhysics.h b/NPLib/Chio/TChio_digPhysics.h
index e015348105cd7163c19ca9676661f0e914fe950b..94d7b9aacf185db922f7a91eec697e401ed5378e 100644
--- a/NPLib/Chio/TChio_digPhysics.h
+++ b/NPLib/Chio/TChio_digPhysics.h
@@ -130,7 +130,7 @@ class TChio_digPhysics : public TObject, public NPA::VDetector
};
-namespace LOCAL_CHIO
+namespace LOCAL_CHIO_DIG
{
double CalibRawAmplitude(double);
}
diff --git a/NPLib/EXL/Makefile b/NPLib/EXL/Makefile
index 65e52983ce050eafff86619e442dc5c719cf29bf..e5a086dc4b5574aeb4475a0182b3b66e3bdc66a8 100644
--- a/NPLib/EXL/Makefile
+++ b/NPLib/EXL/Makefile
@@ -1,22 +1,19 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libExlData.so libExlPhysics.so
+SHARELIB = libExl.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Exl ##
-libExlData.so: TExlData.o TExlDataDict.o
+libExl.so: TExlData.o TExlDataDict.o TExlPhysics.o TExlPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TExlDataDict.cxx: TExlData.h
rootcint -f $@ -c $^
-libExlPhysics.so: TExlPhysics.o TExlPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TExlPhysicsDict.cxx: TExlPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Exogam/Makefile b/NPLib/Exogam/Makefile
index a1a5a3cb24e07da1d6ba26190113757b399614e3..253b4140f37969e706b5965e611bed583cc4f0ed 100644
--- a/NPLib/Exogam/Makefile
+++ b/NPLib/Exogam/Makefile
@@ -1,22 +1,19 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libExogamData.so libExogamPhysics.so
+SHARELIB = libExogam.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
-## MUST2 ##
-libExogamData.so: TExogamData.o TExogamDataDict.o
+## EXOGAM ##
+libExogam.so: TExogamData.o TExogamDataDict.o TExogamPhysics.o TExogamPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TExogamDataDict.cxx: TExogamData.h
rootcint -f $@ -c $^
-libExogamPhysics.so: TExogamPhysics.o TExogamPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TExogamPhysicsDict.cxx: TExogamPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/GASPARD/Makefile b/NPLib/GASPARD/Makefile
index bcce823ee5c8ca067817dadd009b99b419a9ce04..4dabe04811eb3e92658774a94c924ea70865a2da 100644
--- a/NPLib/GASPARD/Makefile
+++ b/NPLib/GASPARD/Makefile
@@ -1,42 +1,33 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libGaspardData.so \
- libGaspardTrackerModules.so libGaspardPhysics.so
+SHARELIB = libGaspard.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Gaspard ##
-libGaspardData.so: TGaspardTrackerData.o TGaspardTrackerDataDict.o
+libGaspard.so: TGaspardTrackerData.o TGaspardTrackerDataDict.o GaspardTracker.o TGaspardTrackerPhysics.o TGaspardTrackerPhysicsDict.o GaspardTrackerModule.o GaspardTrackerDummyShape.o GaspardTrackerTrapezoid.o GaspardTrackerAnnular.o GaspardTrackerSquare.o
+
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TGaspardTrackerDataDict.cxx: TGaspardTrackerData.h
rootcint -f $@ -c $^
-libGaspardPhysics.so: GaspardTracker.o TGaspardTrackerPhysics.o \
- TGaspardTrackerPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TGaspardTrackerPhysicsDict.cxx: TGaspardTrackerPhysics.h
rootcint -f $@ -c $^
-libGaspardTrackerModules.so: GaspardTrackerModule.o GaspardTrackerDummyShape.o \
- GaspardTrackerTrapezoid.o GaspardTrackerAnnular.o \
- GaspardTrackerSquare.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
-
# dependances
-GaspardTracker.o: GaspardTracker.cxx GaspardTracker.h
-TGaspardTrackerData.o: TGaspardTrackerData.cxx TGaspardTrackerData.h
-TGaspardTrackerPhysics.o: TGaspardTrackerPhysics.cxx TGaspardTrackerPhysics.h
-GaspardTrackerModule.o: GaspardTrackerModule.cxx GaspardTrackerModule.h
-GaspardTrackerDummyShape.o: GaspardTrackerDummyShape.cxx GaspardTrackerDummyShape.h
-GaspardTrackerTrapezoid.o: GaspardTrackerTrapezoid.cxx GaspardTrackerTrapezoid.h
-GaspardTrackerAnnular.o: GaspardTrackerAnnular.cxx GaspardTrackerAnnular.h
-GaspardTrackerSquare.o: GaspardTrackerSquare.cxx GaspardTrackerSquare.h
+GaspardTracker.o: GaspardTracker.cxx GaspardTracker.h
+TGaspardTrackerData.o: TGaspardTrackerData.cxx TGaspardTrackerData.h
+TGaspardTrackerPhysics.o: TGaspardTrackerPhysics.cxx TGaspardTrackerPhysics.h
+GaspardTrackerModule.o: GaspardTrackerModule.cxx GaspardTrackerModule.h
+GaspardTrackerDummyShape.o: GaspardTrackerDummyShape.cxx GaspardTrackerDummyShape.h
+GaspardTrackerTrapezoid.o: GaspardTrackerTrapezoid.cxx GaspardTrackerTrapezoid.h
+GaspardTrackerAnnular.o: GaspardTrackerAnnular.cxx GaspardTrackerAnnular.h
+GaspardTrackerSquare.o: GaspardTrackerSquare.cxx GaspardTrackerSquare.h
#######################################
############# Clean and More ##########
diff --git a/NPLib/HYDE/Makefile b/NPLib/HYDE/Makefile
index e08dc60e88751c2e8a71d9e0b1dfa686e9ffae38..7613a31f0cd098212cb656ab489acc3cf719a1b3 100644
--- a/NPLib/HYDE/Makefile
+++ b/NPLib/HYDE/Makefile
@@ -1,26 +1,21 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libHydeData.so libHydePhysics.so
+SHARELIB = libHyde.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Hyde ##
-libHydeData.so: THydeTrackerData.o THydeTrackerDataDict.o
+libHyde.so: THydeTrackerData.o THydeTrackerDataDict.o HydeTracker.o THydeTrackerPhysics.o THydeTrackerPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
THydeTrackerDataDict.cxx: THydeTrackerData.h
rootcint -f $@ -c $^
-libHydePhysics.so: HydeTracker.o THydeTrackerPhysics.o THydeTrackerPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
THydeTrackerPhysicsDict.cxx: THydeTrackerPhysics.h
rootcint -f $@ -c $^
-
-
# dependances
HydeTracker.o: HydeTracker.cxx HydeTracker.h
THydeTrackerData.o: THydeTrackerData.cxx THydeTrackerData.h
diff --git a/NPLib/IORoot/RootInput.cxx b/NPLib/IORoot/RootInput.cxx
index f3814c1417de1a191491794805ef38de63ed0bab..35b3ffcbb26b4a90d59b0f0122ce824b0e097f1e 100644
--- a/NPLib/IORoot/RootInput.cxx
+++ b/NPLib/IORoot/RootInput.cxx
@@ -214,7 +214,7 @@ string RootInput::DumpAsciiFile(const char* type, const char* folder)
{
// build file name
string title = aFile->GetTitle();
- unsigned int pos = title.rfind("/");
+ size_t pos = title.rfind("/");
if (pos != string::npos) name = sfolder + title.substr(pos);
else name = sfolder + "/" + title;
aFile->WriteToFile(name.c_str());
@@ -227,7 +227,7 @@ string RootInput::DumpAsciiFile(const char* type, const char* folder)
{
// build file name
string title = aFile->GetTitle();
- unsigned int pos = title.rfind("/");
+ size_t pos = title.rfind("/");
if (pos != string::npos) name = sfolder + title.substr(pos);
else name = sfolder + "/" + title;
aFile->WriteToFile(name.c_str());
@@ -240,7 +240,7 @@ string RootInput::DumpAsciiFile(const char* type, const char* folder)
{
// build file name
string title = aFile->GetTitle();
- unsigned int pos = title.rfind("/");
+ size_t pos = title.rfind("/");
if (pos != string::npos) name = sfolder + title.substr(pos);
else name = sfolder + "/" + title;
aFile->WriteToFile(name.c_str());
diff --git a/NPLib/MUST2/Makefile b/NPLib/MUST2/Makefile
index d9595edb3145ad9a36247b8cd42882c0a2e3d30b..95002197ec3da9ebbf1cd3327ca3f929316287a7 100644
--- a/NPLib/MUST2/Makefile
+++ b/NPLib/MUST2/Makefile
@@ -2,28 +2,22 @@ include ../Makefile.arch
#------------------------------------------------------------------------------
#SHARELIB = libMust2Data.so libMust2Physics.so libMust2Spectra.so
-SHARELIB = libMust2Data.so libMust2Physics.so
+SHARELIB = libMust2.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## MUST2 ##
-libMust2Data.so: TMust2Data.o TMust2DataDict.o
+libMust2.so: TMust2Data.o TMust2DataDict.o TMust2Physics.o TMust2Spectra.o TMust2SpectraDict.o TMust2PhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TMust2DataDict.cxx: TMust2Data.h
rootcint -f $@ -c $^
-libMust2Physics.so: TMust2Physics.o TMust2PhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TMust2PhysicsDict.cxx: TMust2Physics.h
rootcint -f $@ -c $^
-libMust2Spectra.so: TMust2Spectra.o TMust2SpectraDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TMust2SpectraDict.cxx: TMust2Spectra.h
rootcint -f $@ -c $^
diff --git a/NPLib/Maya/TMayaData.cxx b/NPLib/Maya/TMayaData.cxx
index f2432754b35e4234f85d2d049f40246ab891e603..2ccda0afd8b537d5790c100635ac09de6c5f4413 100755
--- a/NPLib/Maya/TMayaData.cxx
+++ b/NPLib/Maya/TMayaData.cxx
@@ -182,7 +182,7 @@ void TMayaData::SetTOF(UShort_t N,UShort_t T) {
}
-void TMayaData::Dump()
+void TMayaData::Dump() const
{
//cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
/*
diff --git a/NPLib/Maya/TMayaData.h b/NPLib/Maya/TMayaData.h
index 52b0b1991583209decd38d6dd3598483c4a14f2b..ad9324a0aa6d51dcce315ff6e16e904205f09d13 100755
--- a/NPLib/Maya/TMayaData.h
+++ b/NPLib/Maya/TMayaData.h
@@ -128,7 +128,8 @@ class TMayaData : public TObject {
virtual ~TMayaData();
void Clear();
- void Dump();
+ void Clear(const Option_t*){Clear();}
+ void Dump() const;
/* GETTERS */
// (E)
diff --git a/NPLib/Misc/Makefile b/NPLib/Misc/Makefile
index 70e09a2748849279337bb58abdd7cdae958b1a67..3ec449e587e9474bb084e4475fdfddea3c201c73 100644
--- a/NPLib/Misc/Makefile
+++ b/NPLib/Misc/Makefile
@@ -1,34 +1,28 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libTacData.so libTacPhysics.so libTriggerData.so
+SHARELIB = libTacTrigger.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
-libTacData.so: TTacData.o TTacDataDict.o
+libTacTrigger.so: TTacData.o TTacDataDict.o TTacPhysics.o TTacPhysicsDict.o TTriggerData.o TTriggerDataDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TTacDataDict.cxx: TTacData.h
rootcint -f $@ -c $^
-libTacPhysics.so: TTacPhysics.o TTacPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TTacPhysicsDict.cxx: TTacPhysics.h
rootcint -f $@ -c $^
-libTriggerData.so: TTriggerData.o TTriggerDataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TTriggerDataDict.cxx: TTriggerData.h
rootcint -f $@ -c $^
# dependances
-TTacData.o: TTacData.cxx TTacData.h
-TTacPhysics.o: TTacPhysics.cxx TTacPhysics.h
-TTriggerData.o: TTriggerData.cxx TTriggerData.h
+TTacData.o: TTacData.cxx TTacData.h
+TTacPhysics.o: TTacPhysics.cxx TTacPhysics.h
+TTriggerData.o: TTriggerData.cxx TTriggerData.h
#######################################
############# Clean and More ##########
diff --git a/NPLib/Paris/Makefile b/NPLib/Paris/Makefile
index 60015139b4d133f19ad59149794a38c3b6a5f2c0..91206f7cf93084a75cabc18586bc7737a2d8b174 100644
--- a/NPLib/Paris/Makefile
+++ b/NPLib/Paris/Makefile
@@ -1,21 +1,18 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libParisData.so libParisPhysics.so
+SHARELIB = libParis.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Paris ##
-libParisData.so: TParisData.o TParisDataDict.o
+libParis.so: TParisData.o TParisDataDict.o Paris.o TParisPhysics.o TParisPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TParisDataDict.cxx: TParisData.h
rootcint -f $@ -c $^
-libParisPhysics.so: Paris.o TParisPhysics.o TParisPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TParisPhysicsDict.cxx: TParisPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Plastic/Makefile b/NPLib/Plastic/Makefile
index 3a25aae74070746e2ce616c6f6540dca967b671f..8db71ab31431318a69e12b5d3127a6d3d6782600 100644
--- a/NPLib/Plastic/Makefile
+++ b/NPLib/Plastic/Makefile
@@ -1,22 +1,19 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libPlasticData.so libPlasticPhysics.so
+SHARELIB = libPlastic.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Plastic ##
-libPlasticData.so: TPlasticData.o TPlasticDataDict.o
+libPlastic.so: TPlasticData.o TPlasticDataDict.o TPlasticPhysics.o TPlasticPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TPlasticDataDict.cxx: TPlasticData.h
rootcint -f $@ -c $^
-libPlasticPhysics.so: TPlasticPhysics.o TPlasticPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TPlasticPhysicsDict.cxx: TPlasticPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/SSSD/Makefile b/NPLib/SSSD/Makefile
index b83aae994ca612d933a837c45e3cde60e43f44f8..24ab20c71774c08f19714d85ea30153c67413022 100644
--- a/NPLib/SSSD/Makefile
+++ b/NPLib/SSSD/Makefile
@@ -1,22 +1,19 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libSSSDData.so libSSSDPhysics.so
+SHARELIB = libSSSD.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## SSSD ##
-libSSSDData.so: TSSSDData.o TSSSDDataDict.o
+libSSSD.so: TSSSDData.o TSSSDDataDict.o TSSSDPhysics.o TSSSDPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TSSSDDataDict.cxx: TSSSDData.h
rootcint -f $@ -c $^
-libSSSDPhysics.so: TSSSDPhysics.o TSSSDPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TSSSDPhysicsDict.cxx: TSSSDPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Sharc/Makefile b/NPLib/Sharc/Makefile
index d923d6d9832f78667919bb226ed6fa467a742948..c2c8e302e07577a2a2f87a9d49ef58845423b12f 100644
--- a/NPLib/Sharc/Makefile
+++ b/NPLib/Sharc/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libSharcData.so libSharcPhysics.so
+SHARELIB = libSharc.so
#libSharcPhysics.so
all: $(SHARELIB)
@@ -9,15 +9,12 @@ all: $(SHARELIB)
############### Detector ##############
## Sharc ##
-libSharcData.so: TSharcData.o TSharcDataDict.o
+libSharc.so: TSharcData.o TSharcDataDict.o TSharcPhysics.o TSharcPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TSharcDataDict.cxx: TSharcData.h
rootcint -f $@ -c $^
-libSharcPhysics.so: TSharcPhysics.o TSharcPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TSharcPhysicsDict.cxx: TSharcPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Shield/Makefile b/NPLib/Shield/Makefile
index e37820f89e52951332539ed8a805ed2ac49b141a..b492996e0aac9e8b18e5152734cff7515af09e0e 100644
--- a/NPLib/Shield/Makefile
+++ b/NPLib/Shield/Makefile
@@ -1,22 +1,19 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libShieldData.so libShieldPhysics.so
+SHARELIB = libShield.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Shield ##
-libShieldData.so: TShieldData.o TShieldDataDict.o
+libShield.so: TShieldData.o TShieldDataDict.o Shield.o TShieldPhysics.o TShieldPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TShieldDataDict.cxx: TShieldData.h
rootcint -f $@ -c $^
-libShieldPhysics.so: Shield.o TShieldPhysics.o TShieldPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TShieldPhysicsDict.cxx: TShieldPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Speg/Makefile b/NPLib/Speg/Makefile
index 802f09175ac15d5baacab794b4349608316462d8..2663bc4e780033a18f43902a8f9f3147c548f9cd 100644
--- a/NPLib/Speg/Makefile
+++ b/NPLib/Speg/Makefile
@@ -1,38 +1,26 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libSpegDCData.so libSpegCHIOData.so \
- libSpegPlasticData.so \
- libSpegPhysics.so
+SHARELIB = libSpeg.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## SpegDC ##
-libSpegDCData.so: TSpegDCData.o TSpegDCDataDict.o
+libSpeg.so: TSpegDCData.o TSpegDCDataDict.o TSpegCHIOData.o TSpegCHIODataDict.o TSpegPlasticData.o TSpegPlasticDataDict.o TSpegPhysics.o TSpegPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TSpegDCDataDict.cxx: TSpegDCData.h
rootcint -f $@ -c $^
-## SpegCHIO ##
-libSpegCHIOData.so: TSpegCHIOData.o TSpegCHIODataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TSpegCHIODataDict.cxx: TSpegCHIOData.h
rootcint -f $@ -c $^
## SpegPlastic ##
-libSpegPlasticData.so: TSpegPlasticData.o TSpegPlasticDataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TSpegPlasticDataDict.cxx: TSpegPlasticData.h
rootcint -f $@ -c $^
-libSpegPhysics.so: TSpegPhysics.o TSpegPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TSpegPhysicsDict.cxx: TSpegPhysics.h
rootcint -f $@ -c $^
# dependances
diff --git a/NPLib/Tigress/Makefile b/NPLib/Tigress/Makefile
index 904471a31d9b9857d596ca494f7f407926be4ab0..59f2933c0da14570f36ae654c6a932c92e6466f5 100644
--- a/NPLib/Tigress/Makefile
+++ b/NPLib/Tigress/Makefile
@@ -1,14 +1,14 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libTigressData.so libTigressPhysics.so
+SHARELIB = libTigress.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Tigress ##
-libTigressData.so: TTigressData.o TTigressDataDict.o TTigEventFragment.o TTigEventFragmentDict.o
+libTigress.so: TTigressData.o TTigressDataDict.o TTigEventFragment.o TTigressPhysics.o TTigressPhysicsDict.o TTigressClover.o TTigressCrystal.o TTigEventFragmentDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TTigressDataDict.cxx: TTigressData.h
@@ -16,8 +16,6 @@ TTigressDataDict.cxx: TTigressData.h
TTigEventFragmentDict.cxx: TTigEventFragment.h
rootcint -f $@ -c $^
-libTigressPhysics.so: TTigressPhysics.o TTigressPhysicsDict.o TTigressClover.o TTigressCrystal.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TTigressPhysicsDict.cxx: TTigressPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/Tigress/TTigressPhysics.h b/NPLib/Tigress/TTigressPhysics.h
index 5b76f9421e6ce4b17978af4beb407eaab521e8b3..0e895acc3c70cbab160a217f7efdd84a819865dd 100644
--- a/NPLib/Tigress/TTigressPhysics.h
+++ b/NPLib/Tigress/TTigressPhysics.h
@@ -43,6 +43,7 @@ class TTigressPhysics : public TObject, public NPA::VDetector{
~TTigressPhysics() { };
void Clear();
+ void Clear(const Option_t*){Clear();}
public: // inherited from VDetector
// Read stream at ConfigFile to pick-up parameters of detector (Position,...) using Token
diff --git a/NPLib/Tools/Makefile b/NPLib/Tools/Makefile
index 28878fba48a2ab2dcfda29b03844df42b96cca5c..0dbdac9f9a97ba136e5afb1923f90e22c30237f8 100644
--- a/NPLib/Tools/Makefile
+++ b/NPLib/Tools/Makefile
@@ -1,33 +1,21 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libTagManager.so libOptionManager.so libAsciiFile.so libCalibrationManager.so
+SHARELIB = libTools.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############# Various Tool ############
## TAGManager ##
-libTagManager.so: NPTagManager.o NPTagManagerDict.o
+libTools.so: NPTagManager.o NPTagManagerDict.o NPOptionManager.o TAsciiFile.o TAsciiFileDict.o CalibrationManager.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
NPTagManagerDict.cxx: NPTagManager.h
rootcint -f $@ -c $^
-
-## OptionManager ##
-libOptionManager.so: NPOptionManager.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
-## AsciiFile ##
-libAsciiFile.so: TAsciiFile.o TAsciiFileDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TAsciiFileDict.cxx: TAsciiFile.h
rootcint -f $@ -c $^
-
-## Calibration Manager ##
-libCalibrationManager.so: CalibrationManager.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
# dependances
NPTagManager.o:NPTagManager.cxx NPTagManager.h
diff --git a/NPLib/Trifoil/Makefile b/NPLib/Trifoil/Makefile
index a403334b65bf69d8839b93767f95744cedb63ee6..8f0520d1c56b09cb00281b1af4beea0e254d4dd8 100644
--- a/NPLib/Trifoil/Makefile
+++ b/NPLib/Trifoil/Makefile
@@ -1,22 +1,19 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libTrifoilData.so libTrifoilPhysics.so
+SHARELIB = libTrifoil.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## Trifoil ##
-libTrifoilData.so: TTrifoilData.o TTrifoilDataDict.o
+libTrifoil.so: TTrifoilData.o TTrifoilDataDict.o TTrifoilPhysics.o TTrifoilPhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TTrifoilDataDict.cxx: TTrifoilData.h
rootcint -f $@ -c $^
-libTrifoilPhysics.so: TTrifoilPhysics.o TTrifoilPhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TTrifoilPhysicsDict.cxx: TTrifoilPhysics.h
rootcint -f $@ -c $^
diff --git a/NPLib/VDetector/Makefile b/NPLib/VDetector/Makefile
index a2df20fee1fca76e43e2371dec6d5140c2e7a7d2..1384fe38601a27ed98076d170e48357ee1c6b076 100644
--- a/NPLib/VDetector/Makefile
+++ b/NPLib/VDetector/Makefile
@@ -1,18 +1,14 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libVDetector.so libDetectorManager.so
+SHARELIB = libVDetector.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## VDetector ##
-libVDetector.so: VDetector.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
-## VDetector ##
-libDetectorManager.so: DetectorManager.o
+libVDetector.so: VDetector.o DetectorManager.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
# dependances
diff --git a/NPLib/Vamos/Makefile b/NPLib/Vamos/Makefile
index c59d909e9d5e011c87ce6f49a9fdd059cb6e69c8..fb575c690561729bead471cd0ae8fe87a66dd102 100644
--- a/NPLib/Vamos/Makefile
+++ b/NPLib/Vamos/Makefile
@@ -1,35 +1,25 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libVamosPlasticData.so libVamosFingerData.so \
- libVamosCHIOData.so libVamosDCData.so
+SHARELIB = libVamos.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
-## MUST2 ##
-libVamosPlasticData.so: TVamosPlasticData.o TVamosPlasticDataDict.o
+## Vamos ##
+libVamos.so: TVamosPlasticData.o TVamosPlasticDataDict.o TVamosFingerData.o TVamosFingerDataDict.o TVamosCHIOData.o TVamosCHIODataDict.o TVamosDCData.o TVamosDCDataDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TVamosPlasticDataDict.cxx: TVamosPlasticData.h
rootcint -f $@ -c $^
-libVamosFingerData.so: TVamosFingerData.o TVamosFingerDataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TVamosFingerDataDict.cxx: TVamosFingerData.h
rootcint -f $@ -c $^
-libVamosCHIOData.so: TVamosCHIOData.o TVamosCHIODataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TVamosCHIODataDict.cxx: TVamosCHIOData.h
rootcint -f $@ -c $^
-libVamosDCData.so: TVamosDCData.o TVamosDCDataDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TVamosDCDataDict.cxx: TVamosDCData.h
rootcint -f $@ -c $^
diff --git a/NPLib/W1/Makefile b/NPLib/W1/Makefile
index a688c7cdd6d5b1b9e7fa6df3968810df6bfd0502..cc071f584c7759b506cf1e057cbb83b86cc67864 100644
--- a/NPLib/W1/Makefile
+++ b/NPLib/W1/Makefile
@@ -1,27 +1,24 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libW1Data.so libW1Physics.so
+SHARELIB = libW1.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
############### Detector ##############
## W1 ##
-libW1Data.so: TW1Data.o TW1DataDict.o
+libW1.so: TW1Data.o TW1DataDict.o TW1Physics.o TW1PhysicsDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TW1DataDict.cxx: TW1Data.h
rootcint -f $@ -c $^
-libW1Physics.so: TW1Physics.o TW1PhysicsDict.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
TW1PhysicsDict.cxx: TW1Physics.h
rootcint -f $@ -c $^
# dependances
-TW1Data.o: TW1Data.cxx TW1Data.h
+TW1Data.o: TW1Data.cxx TW1Data.h
TW1Physics.o: TW1Physics.cxx TW1Physics.h
#######################################