Merge branch 'master' of https://gitlab.in2p3.fr/ganilanalysis/MFMlib

.gitignore

@@ -11,4 +11,5 @@
 /html/*
 /latex/*
 /sources/TODO.txt
+/src_bis/*
 *.exe

.gitlab-ci.yml

+#image: gitlab-registry.in2p3.fr/fisvik/docker_vamos:master
+#image: gitlab-registry.in2p3.fr/publications/docker:master
+stages:
+    - build
+
+ubuntu20.04:
+  image: gitlab-registry.in2p3.fr/ganilanalysis/docker-acq:master
+  stage: build
+  script:
+    - export ROOTSYS=/opt/root/
+    - export PATH=$ROOTSYS/bin/:$PATH
+    - export LD_LIBRARY_PATH=$ROOTSYS/lib/:$LD_LIBRARY_PATH
+    - mkdir -p build
+    - mkdir -p install
+    - cd build
+    - cmake -DCMAKE_INSTALL_PREFIX=../install ../sources/
+    - make -j4
+
+centos7:
+  image: gitlab-registry.in2p3.fr/ganilanalysis/docker:6.20.06-centos7
+  stage: build
+  script:
+    - export ROOTSYS=/opt/root/
+    - export PATH=$ROOTSYS/bin/:$PATH
+    - export LD_LIBRARY_PATH=$ROOTSYS/lib/:$LD_LIBRARY_PATH
+    - mkdir -p build
+    - mkdir -p install
+    - cd build
+    - cmake -DCMAKE_INSTALL_PREFIX=../install ../sources/
+    - make -j4

README.md

@@ -74,7 +74,7 @@ cmake -DMYTINYXMLDIR=/the/directory/where/libtinyxml.so/is/  -DCMAKE_INSTALL_PRE
 
  In a tuto directory, you have a example usage of MFMlib for you own C++ code
  
- For code documentation , execute "doxygen Doxyfile.MFM" in sources directory , so browse the html directory
+ For code documentation , execute "doxygen Doxyfile.MFM" in src_bis directory , so browse  html/index.html
 ------------------------------------------------------------------------------------------------- 
          
 

sources/CMakeLists.txt

@@ -114,8 +114,6 @@ DataScal.h           MFMChimeraFrame.h  MFMExogamFrame.h    MFMS3eGUNFrame.h   M
 MFMParisFrame.h      MFMS3DeflectorFrame.h
 CUtilities.h         ArgInterpretor.h   MFMFewDefines.h
 GanTape/GEN_TYPE.H   GanTape/gan_acq_buf.h   GanTape/acq_ebyedat_get_next_event.h    GanTape/STR_EVT.H   GanTape/gan_tape_erreur.h  GanTape/gan_acq_swap_buf.h
-
-
 )
 
 add_library(MFMa STATIC ${SRCSlib} ${HEADERSlib})
@@ -137,3 +135,6 @@ install(TARGETS MFMtest.exe MFMa MFM DESTINATION bin
 
 install(FILES ${HEADERSlib} DESTINATION include)
 
+install(FILES ${HEADERSlib} DESTINATION src_bis)
+install(FILES ${SRCSlib} MFMtest.cc Doxyfile.MFM DESTINATION src_bis)
+

sources/MFMCoboFrame.cc

@@ -56,6 +56,7 @@ int  MFMCoboFrame::GetItemSizeFromStructure(int type)const {
 	return(sizeof(MFM_coboItem));
  if (type == MFM_COBOF_FRAME_TYPE)
 	return (sizeof(MFM_cobofItem));
+return 0;
 
 }
 //_______________________________________________________________________________

sources/MFMCommonFrame.cc

@@ -1312,8 +1312,8 @@ int MFMCommonFrame::GetCountFrame() const{
 //_______________________________________________________________________________
 void MFMCommonFrame::TestUserPointer(int noframe) const
 { 
-static uint64_t  sumsize=0;
-static uint64_t  sumsizebefore=0;
+static long long int  sumsize=0;
+static long long int  sumsizebefore=0;
 sumsizebefore = sumsize;
 
 if      (GetFrameType() == MFM_MERGE_EN_FRAME_TYPE) {    sumsize += 20;}// header size
@@ -1322,7 +1322,7 @@ else                                                {    sumsize += GetFrameSize
 
 if  (GetPointUserData() != pData_char + GetDefinedHeaderSize()){
     char tempos[64];
-    sprintf (tempos, "On frame no = %d , sum size = %ll ",noframe,sumsizebefore );     
+    sprintf (tempos, "On frame no = %d , sum size = %lld",noframe,sumsizebefore );     
     
     fError.TreatError ( 0,2," GetPointHeader() no good!",tempos); 
      printf ( "    If is a file, try a \"od -tx1 -Ad -w16 -v -j %lld filename.dat | less\" )\n",sumsizebefore-32); 

sources/MFMCommonFrame.h

@@ -247,7 +247,7 @@ uint16_t MFMNumExoFrame::GetBoardIdFromCommonFrameData() const ;
 */
 
 
- void SetWantedFrameType(uint32_t type){ fWantedFrameType = type;}
+ void SetWantedFrameType(uint16_t type){ fWantedFrameType = type;}
  int  GetWantedFrameType() const { return fWantedFrameType;}
  int  GetCountFrame() const;
 virtual void  TestUserPointer(int noframe) const;

sources/MFMEbyedatFrame.cc

@@ -243,7 +243,7 @@ string MFMEbyedatFrame::GetDumpData(char mode, bool nozero) const {
 	string display("");
 
 	int i, j, maxbin, presentation = 0, max_presentation = 5;
-	char tempo[255];
+	char tempo[300];
 	char Bin[255];
 	char Bin2[255];
 	uint16_t value;

sources/MFMReaTraceFrame.cc

@@ -269,7 +269,7 @@ string MFMReaTraceFrame::DumpData(char mode, bool nozero) const {
 	string display("");
 
 	int i, j, maxbin, presentation = 0, max_presentation = 5;
-	char tempo[255];
+	char tempo[300];
 	char Bin[255];
 	char Bin2[255];
 

sources/MFMScalerDataFrame.cc

@@ -318,7 +318,7 @@ string MFMScalerDataFrame::GetDumpData(char mode, bool nozero)const{
 	string display("");
 
 	int i, j, maxbin, presentation = 0, max_presentation = 1;
-	char tempo[255];
+	char tempo[300];
 	char Bin[255];
 	char Bin2[255];
 	uint64_t count;

sources/MFMSiriusFrame.cc

@@ -251,7 +251,7 @@ string MFMSiriusFrame::GetDumpData(char mode, bool nozero) const {
 	string display("");
 
 	int i, j, maxbin, presentation = 0, max_presentation = 5;
-	char tempo[255];
+	char tempo[300];
 	char Bin[255];
 	char Bin2[255];
 	uint16_t value;

sources/MFMVamosPDFrame.cc

@@ -238,7 +238,7 @@ string MFMVamosPDFrame::DumpData(char mode, bool nozero) const{
 	string display("");
 
 	int i, j, maxbin, presentation = 0, max_presentation = 5;
-	char tempo[255];
+	char tempo[300];
 	char Bin[255];
 	char Bin2[255];
 	uint16_t value;

sources/MFMlib.h

-
-#ifndef __MFMconfig__
-#define __MFMconfig__
-
-#cmakedefine BUILD_DATE ${BUILD_DATE}
-#cmakedefine BUILD_DATE ${BUILD_TIME}
-
-#endif

sources/MFMtest.cc

@@ -556,7 +556,7 @@ void ExtractFrame(){
       fFrame->FillStat();
       if (fLunOut)
       	fwrite(vector, 1, retour, fLunOut);
-      sprintf (tempos, "%d %d %d %d \n",++fExpectedSizeCount,fReadsize-retour, fReadsize - previousfReadsize-retour,retour);
+      sprintf (tempos, "%d %lld %lld %d \n",++fExpectedSizeCount,fReadsize-retour, fReadsize - previousfReadsize-retour,retour);
       len = strlen ( tempos);
       fwrite(tempos,1,len,fLunOutlog);
       previousfReadsize = fReadsize;
@@ -597,7 +597,7 @@ void ExtractPattern(){
    FILE* fLun     = NULL;
    FILE* fLunOutlog          = NULL;
    char logfile[512];
-   char tempos[512];
+   char tempos[600];
    unsigned char cmpvector[1024];
    int countpattern=0;
    string spattern = fPattern;
@@ -665,7 +665,7 @@ void ExtractPattern(){
    	if (fReadsize>fFileSize) break;	
 	
    	if ((memcmp((const char*)vector,(const char*)cmpvector ,countpattern)==0)and (fReadsize>=countpattern)){
-       sprintf (tempos, "%d   %d   %x   %d \n",++count, fReadsize-countpattern,fReadsize-countpattern, fReadsize - previousfReadsize);
+       sprintf (tempos, "%d   %lld   %llx   %lld \n",++count, fReadsize-countpattern,fReadsize-countpattern, fReadsize - previousfReadsize);
 
       len = strlen ( tempos);
       fwrite(tempos,1,len,fLunOutlog);

sources/Version.h

-#define MFM_VERSION  "v21.12.02"
+#define MFM_VERSION  "22.01.13"