diff --git a/Licence/NPToolLicence b/LICENSE
similarity index 100%
rename from Licence/NPToolLicence
rename to LICENSE
diff --git a/NPLib/CalibrationManager/Makefile b/NPLib/CalibrationManager/Makefile
deleted file mode 100644
index a6c78cd13f28ea470fc7b44d8791cf28ae8a8609..0000000000000000000000000000000000000000
--- a/NPLib/CalibrationManager/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-include ../Makefile.arch
-
-#------------------------------------------------------------------------------
-SHARELIB = libCalibrationManager.so
-
-all: $(SHARELIB)
-#------------------------------------------------------------------------------
-############### Detector ##############
-
-## MUST2 ##
-libCalibrationManager.so: CalibrationManager.o
- $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-
-# dependances
-CalibrationManager.o: CalibrationManager.cxx CalibrationManager.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/CalibrationManager/CalibrationManager.cxx b/NPLib/Tools/CalibrationManager.cxx
similarity index 100%
rename from NPLib/CalibrationManager/CalibrationManager.cxx
rename to NPLib/Tools/CalibrationManager.cxx
diff --git a/NPLib/CalibrationManager/CalibrationManager.h b/NPLib/Tools/CalibrationManager.h
similarity index 100%
rename from NPLib/CalibrationManager/CalibrationManager.h
rename to NPLib/Tools/CalibrationManager.h
diff --git a/NPLib/Tools/Makefile b/NPLib/Tools/Makefile
index d8a9f4f434a7830abebbb42424365d430a571633..28878fba48a2ab2dcfda29b03844df42b96cca5c 100644
--- a/NPLib/Tools/Makefile
+++ b/NPLib/Tools/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.arch
#------------------------------------------------------------------------------
-SHARELIB = libTagManager.so libOptionManager.so libAsciiFile.so
+SHARELIB = libTagManager.so libOptionManager.so libAsciiFile.so libCalibrationManager.so
all: $(SHARELIB)
#------------------------------------------------------------------------------
@@ -24,11 +24,16 @@ libAsciiFile.so: TAsciiFile.o TAsciiFileDict.o
TAsciiFileDict.cxx: TAsciiFile.h
rootcint -f $@ -c $^
-
+
+## Calibration Manager ##
+libCalibrationManager.so: CalibrationManager.o
+ $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
+
# dependances
NPTagManager.o:NPTagManager.cxx NPTagManager.h
NPOptionManager.o:NPOptionManager.cxx NPOptionManager.h
TAsciiFile.o: TAsciiFile.cxx TAsciiFile.h
+CalibrationManager.o: CalibrationManager.cxx CalibrationManager.h
#######################################
############# Clean and More ##########
diff --git a/NPLib/W1/TW1Physics.cxx b/NPLib/W1/TW1Physics.cxx
index 9be84f76cb275fbe2d5630372347708efa8e204c..d9b407e2a3b59a615dad5bbbd3f023155925868e 100644
--- a/NPLib/W1/TW1Physics.cxx
+++ b/NPLib/W1/TW1Physics.cxx
@@ -718,6 +718,12 @@ void TW1Physics::ReadAnalysisConfig()
}
cout << "\tLoading user parameters from ConfigW1.dat " << endl;
+ // storing config file in the ROOT output file
+ TAsciiFile *asciiFile = RootOutput::getInstance()->GetAsciiFileAnalysisConfig();
+ asciiFile->AppendLine("%% ConfigW1.dat %%");
+ asciiFile->Append(FileName.c_str());
+ asciiFile->AppendLine("");
+
// read analysis config file
string LineBuffer,DataBuffer;
while (!AnalysisConfigFile.eof()) {
diff --git a/NPSimulation/src/HydeTrackerDummyShape.cc b/NPSimulation/src/HydeTrackerDummyShape.cc
index dd3183a52cedbd556c0d6329b89fc5b7a5a789fb..1040abe187de3a1d0e236de9f4c470e2912634ee 100644
--- a/NPSimulation/src/HydeTrackerDummyShape.cc
+++ b/NPSimulation/src/HydeTrackerDummyShape.cc
@@ -559,8 +559,6 @@ void HydeTrackerDummyShape::ConstructDetector(G4LogicalVolume* world)
MMv = m_X1_Y128[i] - m_X1_Y1[i];
MMv = MMv.unit();
- G4ThreeVector MMscal = MMu.dot(MMv);
-
MMw = MMu.cross(MMv);
// if (MMw.z() > 0) MMw = MMv.cross(MMu) ;
MMw = MMw.unit();
diff --git a/NPSimulation/src/HydeTrackerSquare.cc b/NPSimulation/src/HydeTrackerSquare.cc
index 1287fb3a64ad6f2d66f603aaa0c85ba8630ea953..446ec2bc1fc9847d2193d7eaae573827f1409282 100644
--- a/NPSimulation/src/HydeTrackerSquare.cc
+++ b/NPSimulation/src/HydeTrackerSquare.cc
@@ -741,7 +741,6 @@ void HydeTrackerSquare::ConstructDetector(G4LogicalVolume* world)
MMv = MMv.unit() ;
G4cout << "Norm MMv X = " << MMv(0) << " , Y = " << MMv(1) << " , Z = " << MMv(2) << G4endl;
- G4ThreeVector MMscal = MMu.dot(MMv);
G4cout << "Norm MMu.MMv X = " << MMv(0) << " , Y = " << MMv(1) << " , Z = " << MMv(2) << G4endl;
MMw = MMu.cross(MMv) ;
diff --git a/NPSimulation/src/HydeTrackerTrapezoid.cc b/NPSimulation/src/HydeTrackerTrapezoid.cc
index 0f98230059e1cf443205b0c5a8cafb5d78ecd361..6c696c87b281f63f5c2340c506bfb32aee4e5a70 100644
--- a/NPSimulation/src/HydeTrackerTrapezoid.cc
+++ b/NPSimulation/src/HydeTrackerTrapezoid.cc
@@ -633,7 +633,7 @@ void HydeTrackerTrapezoid::ConstructDetector(G4LogicalVolume* world)
MMv = MMv.unit() ;
G4cout << "Norm MMv: " << MMv << G4endl;
- G4ThreeVector MMscal = MMu.dot(MMv);
+ G4int MMscal = MMu.dot(MMv);
G4cout << "Norm MMu.MMv: " << MMscal << G4endl;
MMw = MMu.cross(MMv) ;
diff --git a/README b/README
deleted file mode 100644
index 3e335937910aeadd4bef4c0ad9e276e625116a86..0000000000000000000000000000000000000000
--- a/README
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: N. de Sereville contact address: deserevi@ipno.in2p3.fr *
- * *
- * Creation Date : 01/09/09 *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * This file describes the content of the NPTool package *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- * *
- *****************************************************************************/
-
-The NPTool package has basically three modules: the NPSimulation
-module in charge of performing the G4 simulation, the NPAnalysis
-module in charge of analysing the results of NPSimulation as well
-as data from real experiments (e.g. MUST2 @ GANIL) and the NPLib
-module which contains a set of libraries needed both by the
-NPSimulation and NPAnalysis modules.
-
-The detailed structure of the NPTool package is:
-NPTool / NPLib
- / NPSimulation
- / NPAnalysis
- / Inputs
- / Outputs
- / NPDocumentation
-
-
-I) NPLib
- This directory contains a set of libraries (each one in
- a dedicated directory) used both in the NPSimulation and
- NPAnalysis modules.
- Complementary informations concerning each library of
- the NPLib can be found in the README file of the NPLib
- directory.
-
-II) NPSimulation
- This directory contains all the files needed to run the
- G4 simulation software. The structure of this directory
- is the typical structure for G4 programs with a src and
- include directory.
-
-III) NPAnalysis
- This directory contains everything related to the analysis
- program treating the output ROOT file from NPSimulation.
- An example of such a program can be found in the subdirectory
- Template which deals with the MUST2 detector.
-
-IV) Inputs
- This directory contains all the input files needed for
- the G4 simulation (NPSimulation). It has the following
- structure:
- Inputs / CrossSection
- / DetectorConstruction
- / EventGenerator
- / EnergyLoss
-
-V) Outputs
- This directory contains the ROOT ouput files of the
- G4 simulation (NPSimulation) and of the analysis
- tools (NPAnalysis). It has the following structure:
- Outputs / Analysis
- / Simulation
-
-VI) NPDocumentation
- This directory contains some detailed documentation
- concerning NPSimulation and NPAnalysis and on how to
- add a new detector to NPSimulation.
diff --git a/README/CREDITS b/README/CREDITS
new file mode 100644
index 0000000000000000000000000000000000000000..b853925f8c821b48e8e402b6b9f235c2594f7262
--- /dev/null
+++ b/README/CREDITS
@@ -0,0 +1,25 @@
+This file lists the most important contributors to the ROOT project.
+It is sorted by name and formatted to allow easy grepping and beautification
+by scripts. The fields are: name (N), email (E), description (D).
+
+N: Sandra Giron
+E: giron@ipno.in2p3.fr
+D: contribution to TMust2Physics
+
+N: Marc Labiche
+E: marc.labiche@stfc.ac.uk
+D: contribution to Paris
+
+N: Adrien Matta
+E: matta@ipno.in2p3.fr
+D: main contributor for NPTool Structure
+ contribution to Must2 and SSSD
+
+N: Angel Sanchez Benitez
+E: angel.sanchez@dfaie.uhu.es
+D: contribution to Hyde
+
+N: Nicolas de Sereville
+E: deserevi@ipno.in2p3.fr
+D: main contributor for NPTool Structure
+ contribution to Gaspard
diff --git a/Licence/Contributor b/README/README/CREDITS
similarity index 100%
rename from Licence/Contributor
rename to README/README/CREDITS
diff --git a/Licence/Geant4Licence b/README/README/G4LICENSE
similarity index 100%
rename from Licence/Geant4Licence
rename to README/README/G4LICENSE
diff --git a/Licence/GPL2.0 b/README/README/GPL2.0
similarity index 100%
rename from Licence/GPL2.0
rename to README/README/GPL2.0
diff --git a/HOWTO b/README/README/HOWTO
similarity index 100%
rename from HOWTO
rename to README/README/HOWTO
diff --git a/INSTALL b/README/README/INSTALL
similarity index 100%
rename from INSTALL
rename to README/README/INSTALL
diff --git a/Licence/header_template b/README/README/header_template
similarity index 100%
rename from Licence/header_template
rename to README/README/header_template
diff --git a/ReleaseNotes.txt b/README/ReleaseNotes.txt
similarity index 80%
rename from ReleaseNotes.txt
rename to README/ReleaseNotes.txt
index ab6599e00f1ac14bbcc410179fea3bb715599eb4..2e535df479f435fa1a3d505038dabfa352b0ec74 100644
--- a/ReleaseNotes.txt
+++ b/README/ReleaseNotes.txt
@@ -1,4 +1,4 @@
-NPTool version xx.xx has been released on January xx 2011.
+NPTool version xx.xx has been released on February 7th 2011.
The following people have contributed to this new version:
Sandra Giron, IPNO
@@ -24,6 +24,9 @@ Nicolas de Sereville, IPNO
+ Symbolic links to *.dylib files are done if on a macosx platform.
+ The 'liblist' file at NPLib level is created.
+ + CalibrationManager class
+ + This class handles in a nice way a collection of calibration files
+
+ NPReaction class
+ Now it is possible to give excitation to the light nucleus in exit channel.
@@ -36,6 +39,7 @@ Nicolas de Sereville, IPNO
+ TAsciiFile class
+ This class allows to store any regular text file in a ROOT file
+ This is used to store the event generator, detector configuration files
+ in ROOT output file.
+ RootInput facility
+ Support for adding TFriend object
@@ -45,7 +49,7 @@ Nicolas de Sereville, IPNO
+ Support for adding TAsciiFile object automatically
+ NPTagManager facility
- ?? Adrien ??
+ + Associate one or more string to an event in a TTree
+ NPSimulation
--------------
@@ -56,7 +60,10 @@ Nicolas de Sereville, IPNO
+ NPAnalysis
------------
+ Using the NPOptionManager facility, calling NPAnalysis is now:
- ./Analysis -D xxx.detector -E xxx.reaction -R RunToTreat.txt
+ ./Analysis -D xxx.detector -E xxx.reaction -R RunToTreat.txt
+ + One can also call Analysis in the following way:
+ ./Analysis -R RunToTreat
+ In this case the configuration files stored in TAsciiFile are used
+ A simple but functional example for MUST2 analysis can be found
in the NPAnalysis/must2 directory.
@@ -67,6 +74,10 @@ Nicolas de Sereville, IPNO
****************************************************************************
+ MUST2
-------
+ + Add configuration parameters:
+ + possibility to suppress channels
+ + give raw and physical threshold
+ + configure Si/SiLi and Si/CsI match conditions
+ GASPARD
---------
diff --git a/TODO b/README/TODO
similarity index 100%
rename from TODO
rename to README/TODO
diff --git a/VERSION b/README/VERSION
similarity index 100%
rename from VERSION
rename to README/VERSION