AnalysisADNE.C

@@ -110,7 +110,8 @@ int main(){
 		}
 		else{
 			cerr<<" That's not a what I expected "<<endl; 
-			gets(ligne);RunNumb=RunNumbSub=0;
+			//gets(ligne);
+			RunNumb=RunNumbSub=0;
 			break;
 		}
 		
@@ -145,7 +146,7 @@ int main(){
 	
 	
 	cout<< "Continue (press enter) " <<endl;
-	gets(ligne);
+	//gets(ligne);
 	//delete (aa);
 	cout << "delete GUser"<<endl;
 	//delete (file);

GUser.C

@@ -466,7 +466,7 @@ void GUser::InitUser()
      for(int k2=0 ; k2<16*4 ; k2++){
 	for(int k3=0 ; k3<16*4 ; k3++){
 		if(fExogam2REA->IsCloverActive(k2/4)&&fExogam2REA->IsCloverActive(k3/4)){
-			MySpectraList->AddSpectrum(fExogam2REA->fMyHistoTT[k2][k3],"ExogamREA/TT");
+			//MySpectraList->AddSpectrum(fExogam2REA->fMyHistoTT[k2][k3],"ExogamREA/TT");
 		}
 	}
      }   
@@ -1173,7 +1173,7 @@ uint16_t label,value;
 		InceptionLayer++;
 		if(InceptionLayer>99){
 				printf("\033[31mInfo:: You have reach the level 100 of Inception Layers -> STOP (Please Adjust) \033[m \n");
-				gets(STOP);
+				//gets(STOP);
 		
 		}
     		//----INCEPTION   pMergeFrame->SetAttributs(frame->GetPointHeader()); // it is a merged frame, so allocate to MergeFrame Class

MakefileExe

@@ -5,7 +5,7 @@ endif
 
 
 ARCH          = $(shell root-config --arch)
-ROOTCFLAGS   := $(shell root-config --cflags) -I$(ROOTSYS)/xmlparser/inc
+ROOTCFLAGS   := $(shell root-config --cflags) -I$(ROOTSYS)/opt/newopt/root_v6.28.04//xmlparser/inc
 ROOTLIBS     := $(shell root-config --libs)   -lSpectrum
 ROOTGLIBS    := $(shell root-config --glibs)  -lSpectrum
 
@@ -13,10 +13,10 @@ MFM_DIR      := $(MFMSYS)
 GRUFLAGS      := -I$(GRUDIR)/include -I$(GRUDIR)/vigru $(ROOTCFLAGS) -I$(MFM_DIR)/include
 GRULIBS       := -I$(ROOTGLIBS) -lXMLIO
 GRULIBS       +=  $(GRUDIR)/lib/libGRU.so
-PHYLIBS       = ./libDetector.so ./libExogam2Data.so ./libExogam2.so ./libExogamData.so \
-                ./libExogam.so ./libMW.so ./libTriggerData.so ./libTrigger.so ./libMWData.so\
-		./libCsIData.so ./libCsI.so ./libNWallData.so ./libNWall.so ./libParisData.so ./libParis.so ./libGenericData.so ./libGeneric.so\
-		./libEbyEData.so ./libEbyE.so  ./libExogam2READata.so ./libExogam2REA.so
+PHYLIBS       = ./libExogam2.so ./libExogam2Data.so ./libExogam.so \
+                ./libExogamData.so ./libMW.so ./libTrigger.so ./libTriggerData.so ./libMWData.so\
+		./libCsI.so ./libCsIData.so ./libNWall.so ./libNWallData.so ./libParis.so ./libParisData.so ./libGeneric.so ./libGenericData.so\
+		./libEbyE.so ./libEbyEData.so  ./libExogam2REA.so ./libExogam2READata.so ./libDetector.so
 
 
 GRULIBS       += ./GUser_C.so 

MakefileExeSpy

@@ -12,10 +12,10 @@ MFM_DIR      := $(MFMSYS)
 GRUFLAGS      := -I$(GRUDIR)/include -I$(GRUDIR)/vigru $(ROOTCFLAGS) -I$(MFM_DIR)/include
 GRULIBS       := -I$(ROOTGLIBS) -lXMLIO
 GRULIBS       +=  $(GRUDIR)/lib/libGRU.so
-PHYLIBS       = ./libDetector.so ./libExogam2Data.so ./libExogam2.so ./libExogamData.so \
-                ./libExogam.so ./libMW.so ./libTriggerData.so ./libTrigger.so ./libMWData.so\
-		./libCsIData.so ./libCsI.so ./libNWallData.so ./libNWall.so ./libParisData.so ./libParis.so ./libGenericData.so ./libGeneric.so\
-		./libEbyEData.so ./libEbyE.so ./libExogam2READata.so ./libExogam2REA.so
+PHYLIBS       = ./libExogam2.so ./libExogam2Data.so ./libExogam.so \
+                ./libExogamData.so ./libMW.so ./libTrigger.so ./libTriggerData.so ./libMWData.so\
+		./libCsI.so ./libCsIData.so ./libNWall.so ./libNWallData.so ./libParis.so ./libParisData.so ./libGeneric.so ./libGenericData.so\
+		./libEbyE.so ./libEbyEData.so  ./libExogam2REA.so ./libExogam2READata.so ./libDetector.so
 
 
 GRULIBS       += ./GUser_C.so 

TCsI.cxx

@@ -200,8 +200,8 @@ bool TCsI::InitNumexo2(Char_t *fileNumexo2){
 	
   ifstream inf_f(fileNumexo2);
   if(inf_f.good()==false) {
-    printf("\033[31m Error Diamant:: Not a valid Look Up Table=> I stop here   \033[m \n"); 
-    gets(stop);
+    printf("\033[31m Error Diamant:: Not a valid Look Up Table=> I complain here   \033[m \n"); 
+    //gets(stop);
   }
   else{
     LUTBool=true;

TCsI.h

@@ -20,7 +20,7 @@
 #include "TRandom.h"
 #include <TCutG.h>
 #include "TObjString.h"
-
+#include "TCsIData.h"
 #define	CsI_E	1
 #define	CsI_T	2
 #define	CsI_PI	3

TExogam2.cxx

@@ -609,8 +609,8 @@ char stop[2];
 	
 	ifstream inf_f(fileNumexo2);
 	if(inf_f.good()==false) {
-		printf("\033[31m Error Exogam2:: Not a valid Look Up Table=> I stop here   \033[m \n"); 
-		gets(stop);
+		printf("\033[31m Error Exogam2:: Not a valid Look Up Table=> I complain here   \033[m \n"); 
+		
 	}
 	else{
 		LUTBool=true;
@@ -1297,7 +1297,7 @@ float EnergyAddTQ[16],EnergyAddTC[16],EnergyAdd[16],mulCrysPerClover[16],EnergyA
 float Theta_Gamma, Phi_Gamma;
 bool IsPrompt[16][4];
 float SumCalorimeter;
-
+Long64_t TS1, TS2;
 
 SumCalorimeter=0;
 	//------------------Time Treat
@@ -1334,7 +1334,10 @@ SumCalorimeter=0;
 					if(BoolSpec&&fExogam2Data->GetECCEEnergy(i)>0&&fExogam2Data->GetECCEEnergy(j)>0&&IsPrompt[clo1][cri1]&&IsPrompt[clo2][cri2]){
 						id1=fExogam2Data->GetECCEDetNbr(i);
 						id2=fExogam2Data->GetECCEDetNbr(j);
-						if(BoolSpec&&abs(fExogam2Data->GetfTimeStamps(id1)-fExogam2Data->GetfTimeStamps(id2))<5){
+						TS1=fExogam2Data->GetfTimeStamps(id1);
+						TS1=fExogam2Data->GetfTimeStamps(id2);
+						
+						if(BoolSpec&&TMath::Abs(TS1-TS2)<5){
 							fMyHistoGammaGammaCore->Fill(fExogam2Data->GetECCEEnergy(i),fExogam2Data->GetECCEEnergy(j)); //all core gg
 							if(fExogam2Data->GetECCEClover(i)==fExogam2Data->GetECCEClover(j)){ //if part of the same clover; then gg only on diagonal cristal
 								if(IsDiagonal(fExogam2Data->GetECCECristal(i),fExogam2Data->GetECCECristal(j)))fMyHistoGammaGammaCoreDiag->Fill(fExogam2Data->GetECCEEnergy(i),fExogam2Data->GetECCEEnergy(j));
@@ -1485,8 +1488,10 @@ SumCalorimeter=0;
 			if(CloverPresent[c]==false) continue;
 			for(Int_t d=0;d<16;d++){
 				if(CloverPresent[d]==false) continue;
+				TS1=fExogam2Data->GetfTimeStamps(EnergyAddTQDCMAPFINGER[c]);
+				TS2=fExogam2Data->GetfTimeStamps(EnergyAddTQDCMAPFINGER[d]);
 				if(c!=d&&EnergyAddTQDC[c]>0&&EnergyAddTQDC[d]>0&&
-					abs(fExogam2Data->GetfTimeStamps(EnergyAddTQDCMAPFINGER[c])-fExogam2Data->GetfTimeStamps(EnergyAddTQDCMAPFINGER[d]))<5
+					TMath::Abs(TS1-TS2)<5
 					&&BoolSpec)fMyHistoGammaGamma->Fill(EnergyAddTQDC[c],EnergyAddTQDC[d]); // with DC
 			}
 		}

TExogam2REA.cxx

@@ -222,7 +222,7 @@ if(BoolSpec){
 			if(CloverPresent[k2/4]==false || CloverPresent[k/4]==false){continue;}
 			else{
 				sprintf(title,"fMyHistoTT_REA%d_%d",k2,k);	
-				fMyHistoTT[k2][k]=new TH1F(title,title,40,-200,200);
+				//fMyHistoTT[k2][k]=new TH1F(title,title,40,-200,200);
 				//HLisTExogam2REA.Add(fMyHistoTT[k2][k]);
 			}
 		}
@@ -618,8 +618,8 @@ char stop[2];
 	
 	ifstream inf_f(fileNumexo2);
 	if(inf_f.good()==false) {
-		printf("\033[31m Error Exogam2 REA:: Not a valid Look Up Table=> I stop here   \033[m \n"); 
-		gets(stop);
+		printf("\033[31m Error Exogam2 REA:: Not a valid Look Up Table=> I complain here   \033[m \n"); 
+		//gets(stop);
 	}
 	else{
 		LUTBool=true;
@@ -1065,6 +1065,7 @@ bool IsPrompt[16][4];
 bool IsSegPrompt[16][4][4];
 float SumCalorimeter, TimeSegLocal;
 float CoreLocal[16][4], SumSeg[16][4];
+Long64_t TS1, TS2;
 
 
 SumCalorimeter=0;
@@ -1156,7 +1157,10 @@ SumCalorimeter=0;
 					if(BoolSpec&&fExogam2READata->GetECCEEnergy(i)>0&&fExogam2READata->GetECCEEnergy(j)>0&&IsPrompt[clo1][cri1]&&IsPrompt[clo2][cri2]){
 						id1=fExogam2READata->GetECCEDetNbr(i);
 						id2=fExogam2READata->GetECCEDetNbr(j);
-						if(BoolSpec&&abs(fExogam2READata->GetfTimeStamps(id1)-fExogam2READata->GetfTimeStamps(id2))<5){
+						
+						TS1=fExogam2READata->GetfTimeStamps(id1);
+						TS1=fExogam2READata->GetfTimeStamps(id2);
+						if(BoolSpec&&TMath::Abs(TS1-TS2)<5){
 							fMyHistoGammaGammaCore->Fill(fExogam2READata->GetECCEEnergy(i),fExogam2READata->GetECCEEnergy(j)); //all core gg
 							if(fExogam2READata->GetECCEClover(i)==fExogam2READata->GetECCEClover(j)){ //if part of the same clover; then gg only on diagonal cristal
 								if(IsDiagonal(fExogam2READata->GetECCECristal(i),fExogam2READata->GetECCECristal(j)))fMyHistoGammaGammaCoreDiag->Fill(fExogam2READata->GetECCEEnergy(i),fExogam2READata->GetECCEEnergy(j));
@@ -1165,7 +1169,7 @@ SumCalorimeter=0;
 								fMyHistoGammaGammaCoreDiag->Fill(fExogam2READata->GetECCEEnergy(i),fExogam2READata->GetECCEEnergy(j));
 							}
 						}
-						if(BoolSpec)fMyHistoTT[id1][id2]->Fill(Cal(fExogam2READata->GetfTimeStamps(id1),0.,10.,0)-Cal(fExogam2READata->GetfTimeStamps(id2),0.,10.,0));
+						//if(BoolSpec)fMyHistoTT[id1][id2]->Fill(Cal(fExogam2READata->GetfTimeStamps(id1),0.,10.,0)-Cal(fExogam2READata->GetfTimeStamps(id2),0.,10.,0));
 						if(BoolSpec)fMyHistoTTAll->Fill(Cal(fExogam2READata->GetfTimeStamps(id1),0.,10.,0)-Cal(fExogam2READata->GetfTimeStamps(id2),0.,10.,0));
 					}
 				}
@@ -1301,10 +1305,13 @@ SumCalorimeter=0;
 	if(cloverMul>1){
 		for(Int_t c=0;c<16;c++){
 			if(CloverPresent[c]==false) continue;
+			
 			for(Int_t d=0;d<16;d++){
 				if(CloverPresent[d]==false) continue;
+				TS1=fExogam2READata->GetfTimeStamps(EnergyAddTQDCMAPFINGER[c]);
+				TS2=fExogam2READata->GetfTimeStamps(EnergyAddTQDCMAPFINGER[d]);
 				if(c!=d&&EnergyAddTQDC[c]>0&&EnergyAddTQDC[d]>0&&
-					abs(fExogam2READata->GetfTimeStamps(EnergyAddTQDCMAPFINGER[c])-fExogam2READata->GetfTimeStamps(EnergyAddTQDCMAPFINGER[d]))<5
+					TMath::Abs(TS1-TS2)<5
 					&&BoolSpec)fMyHistoGammaGamma->Fill(EnergyAddTQDC[c],EnergyAddTQDC[d]); // with DC
 			}
 		}

TExogam2REA.h

@@ -80,7 +80,7 @@ class TExogam2REA : public TDetector {
    TH2F * fMyHistoECCET30_60[16*100+4*10];
    TH2F * fMyHistoECCET30_90[16*100+4*10];
    TH2F * fMyHistoECCET60_90[16*100+4*10];
-   TH1F * fMyHistoTT[16*4][16*4];
+   //TH1F * fMyHistoTT[16*4][16*4];
    TH1F * fMyHistoTTAll;
    
    TH1F *BoardIdHist ;

TGeneric.cxx

@@ -79,10 +79,10 @@ char stop[2];
 	//sprintf(Cname, "./CutDiamant/sorlinCHIO.root"); // RUN S36
 	//sprintf(Cname, "./CutDiamant/sorlinCHIO34Si.root"); // RUN Si34 on Au
 	sprintf(Cname, "./CutDiamant/sorlinCHIO34Si-C.root"); // RUN Si34 on C
-	
+	cout<<1<<endl;
 	if (fopen(Cname, "r") != NULL) {
 		TFile fileCut(Cname, "READ");
-		
+		cout<<2<<endl;
 		/*gcut_Array[0]=(TCutG*) fileCut.Get("S40");
 		gcut_Array[1]=(TCutG*) fileCut.Get("P38");
 		gcut_Array[2]=(TCutG*) fileCut.Get("Si36");
@@ -104,23 +104,26 @@ char stop[2];
 		*/
 		//gcut_Array[0]=(TCutG*) fileCut.Get("S36");
 		gcut_Array[0]=(TCutG*) fileCut.Get("Si34");
-		gcut_Array[1]=(TCutG*) fileCut.Get("Si34");
+		/*gcut_Array[1]=(TCutG*) fileCut.Get("Si34");
 		gcut_Array[2]=(TCutG*) fileCut.Get("Si34");
 		gcut_Array[3]=(TCutG*) fileCut.Get("Si34");
 		gcut_Array[4]=(TCutG*) fileCut.Get("Si34");
 		gcut_Array[5]=(TCutG*) fileCut.Get("Si34");
 		gcut_Array[6]=(TCutG*) fileCut.Get("Si34");
 		gcut_Array[7]=(TCutG*) fileCut.Get("Si34");
-		gcut_Array[8]=(TCutG*) fileCut.Get("Si34");
+		gcut_Array[8]=(TCutG*) fileCut.Get("Si34");*/
 
-		
+		cout<<2.5<<endl;
 		
 		//NombreIons=9;
+		
 		fileCut.Close();
+		cout<<3.0<<endl;
 		CutLoaded=true;
+		cout<<3<<endl;
 	}
 	else {
-		cout << "Error:: Could not read generic cut" << endl;
+		cout << "Error:: Could not read generic cut 1" << endl;
         }
 	
 	//sprintf(Cname, "./CutDiamant/putain2.root");//RUN 638-679 DSSD 36Si setting
@@ -139,7 +142,7 @@ char stop[2];
 		CutLoaded=true;
 	}
 	else {
-		cout << "Error:: Could not read generic cut" << endl;
+		cout << "Error:: Could not read generic cut 2" << endl;
         }
 	
 	/* sprintf(Cname, "./CutDiamant/sorlinCHIO34Si-C-30Mg.root");	// RUN Si34 on Carbon target + DSSD = 30Mg
@@ -165,7 +168,7 @@ char stop[2];
 		CutLoaded=true;
 	}
 	else {
-		cout << "Error:: Could not read generic cut" << endl;
+		cout << "Error:: Could not read generic cut 3" << endl;
         } 
 	
 	
@@ -289,8 +292,8 @@ bool TGeneric::InitNumexo2(Char_t *fileNumexo2){
 	
   ifstream inf_f(fileNumexo2);
   if(inf_f.good()==false) {
-    printf("\033[31m Error Exogam2:: Not a valid Look Up Table=> I stop here   \033[m \n"); 
-    gets(stop);
+    printf("\033[31m Error Exogam2:: Not a valid Look Up Table=> I complain here   \033[m \n"); 
+    //gets(stop);
   }
   else{
     LUTBool=true;

TGenericData.cxx

@@ -45,6 +45,6 @@ void TGenericData::Dump()
    for(Int_t i =0 ; i<GetGenericMult(); i++){
    		cout<<"GetGenericDet "<< GetGenericDet(i)<< "::  GetGenericQShort  "<<GetGenericEnergy(i)<<endl;;
   }
-  gets(stop);
+  //gets(stop);
 
 }

TNWall.cxx

@@ -468,8 +468,8 @@ char stop[2];
 	
 	ifstream inf_f(fileNumexo2);
 	if(inf_f.good()==false) {
-		printf("\033[31m Error:: Not a valid Look Up Table=> I stop here   \033[m \n"); 
-		gets(stop);
+		printf("\033[31m Error:: Not a valid Look Up Table=> I complain here   \033[m \n"); 
+		//gets(stop);
 	}
 	else{
 		LUTBool=true;

TParis.cxx

@@ -290,8 +290,8 @@ bool TParis::InitNumexo2(Char_t *fileNumexo2){
 	
   ifstream inf_f(fileNumexo2);
   if(inf_f.good()==false) {
-    printf("\033[31m Error:: Not a valid Look Up Table=> I stop here   \033[m \n"); 
-    gets(stop);
+    printf("\033[31m Error:: Not a valid Look Up Table=> I complain here here   \033[m \n"); 
+    //gets(stop);
   }
   else{
     LUTBool=true;

TParisData.cxx

@@ -58,6 +58,6 @@ void TParisData::Dump()
    for(Int_t i =0 ; i<GetParisMult(); i++){
    		cout<<"GetParisDet "<< GetParisDet(i)<< "::  GetParisQShort  "<<GetParisQShort(i)<<endl;;
   }
-  gets(stop);
+ // gets(stop);
 
 }

out

-/space/clement/space/AGATA/
+/data/e845X/e845/Analyse
\ No newline at end of file

scriptInstall.sh

+#!/bin/sh 
 make veryclean
 echo very clean done
 
-export GRUSYS=/home/acqexp/Analysis/GRU/el7.x86_64/R5_v21.10.06
-export MFMSYS=/home/acqexp/Analysis/MFMlib/el7.x86_64/v21.10.06
-#export GRUSYS=/home/acqexp/Analysis/GRU/el7.x86_64/R5_v22.01.13
-#export MFMSYS=/home/acqexp/Analysis/MFMlib/el7.x86_64/v21.01.13
 
 
+my_os=`uname -a | grep Ubuntu`
+if [ -z "${my_os}" ]; then
+#CENTOS 7 GANIL 
+	export GRUSYS=/home/acqexp/Analysis/GRU/el7.x86_64/R5_v21.10.06
+	export MFMSYS=/home/acqexp/Analysis/MFMlib/el7.x86_64/v21.10.06
+else
+#UBUNTU22 GANIL
+	export GRUSYS=/home/acqexp/Analysis/GRU/ubu22.04.x86_64/R6_v23.04.21
+	export MFMSYS=/home/acqexp/Analysis/MFMlib//ubu22.04.x86_64/v23.04.21
+fi
+
 export LD_LIBRARY_PATH=$ROOTSYS/lib:$GRUSYS/lib
 make -j4
 echo ----------- Detectors lib compiled