Commit 50804221 authored by Antoine Lemasson's avatar Antoine Lemasson
Browse files
parents d535b3b1 1e5fe5f3
Pipeline #156666 passed with stage
in 23 seconds
...@@ -11,4 +11,5 @@ ...@@ -11,4 +11,5 @@
/html/* /html/*
/latex/* /latex/*
/sources/TODO.txt /sources/TODO.txt
/src_bis/*
*.exe *.exe
#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
...@@ -74,7 +74,7 @@ cmake -DMYTINYXMLDIR=/the/directory/where/libtinyxml.so/is/ -DCMAKE_INSTALL_PRE ...@@ -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 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
------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------
......
...@@ -114,8 +114,6 @@ DataScal.h MFMChimeraFrame.h MFMExogamFrame.h MFMS3eGUNFrame.h M ...@@ -114,8 +114,6 @@ DataScal.h MFMChimeraFrame.h MFMExogamFrame.h MFMS3eGUNFrame.h M
MFMParisFrame.h MFMS3DeflectorFrame.h MFMParisFrame.h MFMS3DeflectorFrame.h
CUtilities.h ArgInterpretor.h MFMFewDefines.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 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}) add_library(MFMa STATIC ${SRCSlib} ${HEADERSlib})
...@@ -137,3 +135,6 @@ install(TARGETS MFMtest.exe MFMa MFM DESTINATION bin ...@@ -137,3 +135,6 @@ install(TARGETS MFMtest.exe MFMa MFM DESTINATION bin
install(FILES ${HEADERSlib} DESTINATION include) install(FILES ${HEADERSlib} DESTINATION include)
install(FILES ${HEADERSlib} DESTINATION src_bis)
install(FILES ${SRCSlib} MFMtest.cc Doxyfile.MFM DESTINATION src_bis)
...@@ -56,6 +56,7 @@ int MFMCoboFrame::GetItemSizeFromStructure(int type)const { ...@@ -56,6 +56,7 @@ int MFMCoboFrame::GetItemSizeFromStructure(int type)const {
return(sizeof(MFM_coboItem)); return(sizeof(MFM_coboItem));
if (type == MFM_COBOF_FRAME_TYPE) if (type == MFM_COBOF_FRAME_TYPE)
return (sizeof(MFM_cobofItem)); return (sizeof(MFM_cobofItem));
return 0;
} }
//_______________________________________________________________________________ //_______________________________________________________________________________
......
...@@ -1312,8 +1312,8 @@ int MFMCommonFrame::GetCountFrame() const{ ...@@ -1312,8 +1312,8 @@ int MFMCommonFrame::GetCountFrame() const{
//_______________________________________________________________________________ //_______________________________________________________________________________
void MFMCommonFrame::TestUserPointer(int noframe) const void MFMCommonFrame::TestUserPointer(int noframe) const
{ {
static uint64_t sumsize=0; static long long int sumsize=0;
static uint64_t sumsizebefore=0; static long long int sumsizebefore=0;
sumsizebefore = sumsize; sumsizebefore = sumsize;
if (GetFrameType() == MFM_MERGE_EN_FRAME_TYPE) { sumsize += 20;}// header size if (GetFrameType() == MFM_MERGE_EN_FRAME_TYPE) { sumsize += 20;}// header size
...@@ -1322,7 +1322,7 @@ else { sumsize += GetFrameSize ...@@ -1322,7 +1322,7 @@ else { sumsize += GetFrameSize
if (GetPointUserData() != pData_char + GetDefinedHeaderSize()){ if (GetPointUserData() != pData_char + GetDefinedHeaderSize()){
char tempos[64]; 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); 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); printf ( " If is a file, try a \"od -tx1 -Ad -w16 -v -j %lld filename.dat | less\" )\n",sumsizebefore-32);
......
...@@ -247,7 +247,7 @@ uint16_t MFMNumExoFrame::GetBoardIdFromCommonFrameData() const ; ...@@ -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 GetWantedFrameType() const { return fWantedFrameType;}
int GetCountFrame() const; int GetCountFrame() const;
virtual void TestUserPointer(int noframe) const; virtual void TestUserPointer(int noframe) const;
......
...@@ -243,7 +243,7 @@ string MFMEbyedatFrame::GetDumpData(char mode, bool nozero) const { ...@@ -243,7 +243,7 @@ string MFMEbyedatFrame::GetDumpData(char mode, bool nozero) const {
string display(""); string display("");
int i, j, maxbin, presentation = 0, max_presentation = 5; int i, j, maxbin, presentation = 0, max_presentation = 5;
char tempo[255]; char tempo[300];
char Bin[255]; char Bin[255];
char Bin2[255]; char Bin2[255];
uint16_t value; uint16_t value;
......
...@@ -269,7 +269,7 @@ string MFMReaTraceFrame::DumpData(char mode, bool nozero) const { ...@@ -269,7 +269,7 @@ string MFMReaTraceFrame::DumpData(char mode, bool nozero) const {
string display(""); string display("");
int i, j, maxbin, presentation = 0, max_presentation = 5; int i, j, maxbin, presentation = 0, max_presentation = 5;
char tempo[255]; char tempo[300];
char Bin[255]; char Bin[255];
char Bin2[255]; char Bin2[255];
......
...@@ -318,7 +318,7 @@ string MFMScalerDataFrame::GetDumpData(char mode, bool nozero)const{ ...@@ -318,7 +318,7 @@ string MFMScalerDataFrame::GetDumpData(char mode, bool nozero)const{
string display(""); string display("");
int i, j, maxbin, presentation = 0, max_presentation = 1; int i, j, maxbin, presentation = 0, max_presentation = 1;
char tempo[255]; char tempo[300];
char Bin[255]; char Bin[255];
char Bin2[255]; char Bin2[255];
uint64_t count; uint64_t count;
......
...@@ -251,7 +251,7 @@ string MFMSiriusFrame::GetDumpData(char mode, bool nozero) const { ...@@ -251,7 +251,7 @@ string MFMSiriusFrame::GetDumpData(char mode, bool nozero) const {
string display(""); string display("");
int i, j, maxbin, presentation = 0, max_presentation = 5; int i, j, maxbin, presentation = 0, max_presentation = 5;
char tempo[255]; char tempo[300];
char Bin[255]; char Bin[255];
char Bin2[255]; char Bin2[255];
uint16_t value; uint16_t value;
......
...@@ -238,7 +238,7 @@ string MFMVamosPDFrame::DumpData(char mode, bool nozero) const{ ...@@ -238,7 +238,7 @@ string MFMVamosPDFrame::DumpData(char mode, bool nozero) const{
string display(""); string display("");
int i, j, maxbin, presentation = 0, max_presentation = 5; int i, j, maxbin, presentation = 0, max_presentation = 5;
char tempo[255]; char tempo[300];
char Bin[255]; char Bin[255];
char Bin2[255]; char Bin2[255];
uint16_t value; uint16_t value;
......
#ifndef __MFMconfig__
#define __MFMconfig__
#cmakedefine BUILD_DATE ${BUILD_DATE}
#cmakedefine BUILD_DATE ${BUILD_TIME}
#endif
...@@ -556,7 +556,7 @@ void ExtractFrame(){ ...@@ -556,7 +556,7 @@ void ExtractFrame(){
fFrame->FillStat(); fFrame->FillStat();
if (fLunOut) if (fLunOut)
fwrite(vector, 1, retour, 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); len = strlen ( tempos);
fwrite(tempos,1,len,fLunOutlog); fwrite(tempos,1,len,fLunOutlog);
previousfReadsize = fReadsize; previousfReadsize = fReadsize;
...@@ -597,7 +597,7 @@ void ExtractPattern(){ ...@@ -597,7 +597,7 @@ void ExtractPattern(){
FILE* fLun = NULL; FILE* fLun = NULL;
FILE* fLunOutlog = NULL; FILE* fLunOutlog = NULL;
char logfile[512]; char logfile[512];
char tempos[512]; char tempos[600];
unsigned char cmpvector[1024]; unsigned char cmpvector[1024];
int countpattern=0; int countpattern=0;
string spattern = fPattern; string spattern = fPattern;
...@@ -665,7 +665,7 @@ void ExtractPattern(){ ...@@ -665,7 +665,7 @@ void ExtractPattern(){
if (fReadsize>fFileSize) break; if (fReadsize>fFileSize) break;
if ((memcmp((const char*)vector,(const char*)cmpvector ,countpattern)==0)and (fReadsize>=countpattern)){ 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); len = strlen ( tempos);
fwrite(tempos,1,len,fLunOutlog); fwrite(tempos,1,len,fLunOutlog);
......
#define MFM_VERSION "v21.12.02" #define MFM_VERSION "22.01.13"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment