Merge branch 'Cubix' into 'Cubix'

Add Nuclear chart and energy calibration utility

See merge request !46

src/root/gem/BaseGEM.cpp

@@ -171,6 +171,25 @@ BaseGEM::BaseGEM():
     fAD.SetOwner(kTRUE);
 }
 
+BaseGEM::BaseGEM(LevelScheme *lev) :
+	TObject(),
+	fLevelScheme(lev), fFeeding(), fRandFeeding(), fRandDown(), fAD(), fRand0(), fTmp(), fEoC(),
+	fDirection(kDown),
+	fMinEnergyFactor(10.0),
+	fADType(0),
+	fCutLifeTime(0.0000000001), /* 0.1*ns from Krane 1971 */
+	fSigma(0.0)
+{
+	fTmp.SetOwner(kTRUE);
+	fRandDown.SetOwner(kTRUE);
+	fFeeding.SetOwner(kTRUE);
+	fRandFeeding.SetOwner(kTRUE);
+	fAD.SetOwner(kTRUE);
+	
+	InitRandom();
+}
+
+
 BaseGEM::~BaseGEM()
 {
 	BaseGEM::Clear(""); // clear everything
@@ -576,8 +595,8 @@ Int_t BaseGEM::DoCascade(TSeqCollection &cas, TSeqCollection &directions, Int_t
 	obj = ((RandObj *)fRandFeeding.At( which_first ))->Rand();
 	while ( obj != &fEoC ) {
 		link = (Link *)fLevelScheme->GetLinks().At(obj->GetUniqueID());
-        result_one_link += link->DoCascade(cas,o);
-        
+        result_one_link = link->DoCascade(cas,o);
+		
         for (Int_t i = result; i < result + result_one_link; i++) { // make sur the direction collection is synchronize with cas
             if ( directions.At(i) == 0 ) {
                 directions.AddAt(new TLorentzVector(),i);

src/root/gem/BaseGEM.h

@@ -141,7 +141,8 @@ namespace Gw {
         virtual void DoAngularDistribution(Int_t which_gamma, TLorentzVector &, Bool_t forceiso = false);
 
     public:
-        BaseGEM();
+		BaseGEM();
+		BaseGEM(LevelScheme *);
         virtual ~BaseGEM();
         
         //! To get all the entry point in this level scheme with their intensities

src/root/gui/CMakeLists.txt

@@ -6,6 +6,7 @@
 # Add modules
 #
 add_subdirectory (cubix)
+add_subdirectory (fipps_spy)
 
 
 

src/root/gui/cubix/CMakeLists.txt

@@ -41,7 +41,7 @@ LINK_DIRECTORIES( ${ROOT_LIBRARY_DIR} )
 SET(EXTRA_EXTERNAL_LIBRARIES ${EXTRA_EXTERNAL_LIBRARIES} Matrix Rint)
 
 # gw
-set(EXTRA_INTERNAL_LIBRARIES GWPHYSICS )
+set(EXTRA_INTERNAL_LIBRARIES GWPHYSICS GWTOOLS)
 
 ####################
 ### define files ###

src/root/gui/cubix/DataBase/Sources/133Ba.source

+ 53.156
+ 79.623
+ 80.999
+160.609
+223.116
+276.404
+302.858
+356.014
+383.859

src/root/gui/cubix/DataBase/Sources/134Cs.source

+ 475.36
+ 563.27
+ 569.30
+ 604.68
+ 795.78
+ 801.86
+1038.53
+1167.89
+1365.17

src/root/gui/cubix/DataBase/Sources/137Cs.source

+661.661

src/root/gui/cubix/DataBase/Sources/152Eu.source

+ 121.7793
+ 244.6927
+ 344.2724
+ 411.111
+ 443.979
+ 778.890
+ 964.014
+1085.793
+#1089.700
+1112.070
+1407.993

src/root/gui/cubix/DataBase/Sources/208Pb.source

+2614.5

src/root/gui/cubix/DataBase/Sources/22Na.source

+ 511.006
+1274.545

src/root/gui/cubix/DataBase/Sources/241Am.source

+26.345
+59.537

src/root/gui/cubix/DataBase/Sources/40K.source

+122.0614
+136.4743