Skip to content

Commit

Permalink
Compile everything 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
Igor Alekseev committed Feb 18, 2024
1 parent c38ca2e commit 1312312
Show file tree
Hide file tree
Showing 30 changed files with 120 additions and 81 deletions.
Binary file modified burcmc/burcmc
Binary file not shown.
Binary file modified burcmc/burcmc.o
Binary file not shown.
Binary file modified cmcmtest/cmcmtest
Binary file not shown.
Binary file modified cmcmtest/cmcmtest.o
Binary file not shown.
5 changes: 3 additions & 2 deletions emit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
#include ../include/common.mk
#emitscan: emitscan.o emitsend.o ../rpoldaemon/globals.o ../rpoldaemon/rpoldata.o

CERNDIR = ../../cernlib_2006

include /vobs/libs/makefiles/MakeStd.inc

NAME = emitscan

USESOLIBS = yes
INC = -I../include
USER_CXXFLAGS = $(shell root-config --cflags)
LDFLAGS = $(shell root-config --libs)
USER_CXXFLAGS = $(shell $(CERNDIR)/bin/root-config --cflags)
LDFLAGS = $(shell $(CERNDIR)/bin/root-config --libs)

PROG1 = emitscan
SRCS1 = emitscan.cpp emitsend.cpp globals.cpp rpoldata.cpp
Expand Down
20 changes: 10 additions & 10 deletions emit/TimeStamp.c
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
char* UIAGSVersionDate = "Tue Jan 27 12:34:07 2015";
char* versionDate = "Tue Jan 27 12:34:07 2015";
char* versionDateStr = "date:=Tue Jan 27 12:34:07 2015";
char* UIAGSVersionDate = "Вс 18 фев 2024 15:04:48";
char* versionDate = "Вс 18 фев 2024 15:04:48";
char* versionDateStr = "date:=Вс 18 фев 2024 15:04:48";
char* clearcaseView = "/view/igor";
char* clearcaseViewStr = "view:=/view/igor";
char* clearcaseConfigSpec = "\nelement * CHECKEDOUT\nelement * /main/LATEST\n";
char* clearcaseConfigSpecStr = "configSpec:=element * CHECKEDOUTelement * /main/LATEST";
char* compileFlags = "-I/usr/include -I/usr/include/c++/4.4.7/ -I/usr/include/c++/4.4.7/x86_64-redhat-linux -I/usr/include/c++/4.4.7/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/4.4.7/ -B/usr/libexec/gcc/x86_64-redhat-linux/4.4.7/ -D__X86 -D__WS6 -Wreturn-type -Wno-write-strings -g -pthread";
char* compileFlagsStr = "g++:=-I/usr/include -I/usr/include/c++/4.4.7/ -I/usr/include/c++/4.4.7/x86_64-redhat-linux -I/usr/include/c++/4.4.7/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/4.4.7/ -B/usr/libexec/gcc/x86_64-redhat-linux/4.4.7/ -D__X86 -D__WS6 -Wreturn-type -Wno-write-strings -g -pthread";
char* kernel = "2.6.32-431.23.3.el6.x86_64";
char* kernelstr = "kernel:=2.6.32-431.23.3.el6.x86_64";
char* clearcaseConfigSpec = "\nelement * CHECKEDOUT\nelement * /main/CDEV_LATEST\nelement * /main/LATEST\n";
char* clearcaseConfigSpecStr = "configSpec:=element * CHECKEDOUTelement * /main/CDEV_LATESTelement * /main/LATEST";
char* compileFlags = "-I/cfs/x/usrLocals/WS/glibc-2.28/install/include -I/usr/include -I/usr/include/c++/8 -I/usr/include/c++/8/x86_64-redhat-linux -I/usr/include/c++/8/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/8 -B/usr/libexec/gcc/x86_64-redhat-linux/8 -D__X86 -D__WS8 -Wno-write-strings -g -pthread";
char* compileFlagsStr = "g++:=-I/cfs/x/usrLocals/WS/glibc-2.28/install/include -I/usr/include -I/usr/include/c++/8 -I/usr/include/c++/8/x86_64-redhat-linux -I/usr/include/c++/8/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/8 -B/usr/libexec/gcc/x86_64-redhat-linux/8 -D__X86 -D__WS8 -Wno-write-strings -g -pthread";
char* kernel = "4.18.0-305.17.1.el8_4.x86_64";
char* kernelstr = "kernel:=4.18.0-305.17.1.el8_4.x86_64";
char* node = "acnlinc6.pbn.bnl.gov";
char* nodestr = "node:=acnlinc6.pbn.bnl.gov";
char* OSstr = "OS:=Red Hat Enterprise Linux Workstation release 6.5 (Santiago)";
char* OSstr = "OS:=Red Hat Enterprise Linux release 8.4 (Ootpa)";
19 changes: 10 additions & 9 deletions emit/emitscan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Improved code readability
*/

#define CDEV_HAS_64BIT_LONGS
#define _FILE_OFFSET_BITS 64 // to handle >2Gb files
#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -240,7 +241,7 @@ int main(int argc, char **argv)

if ((unsigned)rec.header.len > BSIZE * sizeof(int)) {
poldat.statusS |= WARN_INT;
printf("EMIT-WARN : Very large record (%ld).\n", rec.header.len);
printf("EMIT-WARN : Very large record (%d).\n", rec.header.len);
i = fseek(fin, rec.header.len - sizeof(recordHeaderStruct), SEEK_CUR);
if (feof(fin)) break;
if (i != 0) {
Expand Down Expand Up @@ -277,7 +278,7 @@ int main(int argc, char **argv)
exit(-2);
}

printf("EMIT-INFO : Begin of data set version=%ld for ", rec.begin.version);
printf("EMIT-INFO : Begin of data set version=%d for ", rec.begin.version);
if (rec.header.type & REC_YELLOW) {
printf("YELLOW");
fitRing = 1;
Expand Down Expand Up @@ -321,7 +322,7 @@ int main(int argc, char **argv)
i += sizeof(subheadStruct) + nRecEvt * sizeof(ATStruct);

if (i > rec.header.len - sizeof(recordHeaderStruct)) {
printf("Broken record %ld (%ld bytes). Last subhead: siNum=%d Events=%d\n", rec.header.num, rec.header.len, St + 1, nRecEvt);
printf("Broken record %d (%d bytes). Last subhead: siNum=%d Events=%d\n", rec.header.num, rec.header.len, St + 1, nRecEvt);
break;
}

Expand Down Expand Up @@ -484,7 +485,7 @@ int main(int argc, char **argv)
nStepCnt, vStepOrb[0], vStepOrb[nStepCnt - 1], midStepCnt);

int *stepOrb = (int *) malloc( (lastOrb + 1) * sizeof(int) );
memset(stepOrb, 0, sizeof(stepOrb));
memset(stepOrb, 0, (lastOrb + 1) * sizeof(int));

for (i = firstOrb; i < (unsigned) vStepOrb[midStepCnt]; i++) {
for (j = 0; j <= midStepCnt; j++) {
Expand Down Expand Up @@ -552,7 +553,7 @@ int main(int argc, char **argv)

if ((unsigned)rec.header.len > BSIZE * sizeof(int)) {
poldat.statusS |= WARN_INT;
printf("EMIT-WARN : Very large record (%ld).\n", rec.header.len);
printf("EMIT-WARN : Very large record (%d).\n", rec.header.len);
i = fseek(fin, rec.header.len - sizeof(recordHeaderStruct), SEEK_CUR);
if (feof(fin)) break;
if (i != 0) {
Expand Down Expand Up @@ -584,7 +585,7 @@ int main(int argc, char **argv)
poldat.statusS |= (STATUS_ERROR | ERR_INT);
exit(-2);
}
printf("EMIT-INFO : Begin of data set version=%ld for ", rec.begin.version);
printf("EMIT-INFO : Begin of data set version=%d for ", rec.begin.version);
if (rec.header.type & REC_YELLOW) {
printf("YELLOW");
fitRing = 1;
Expand All @@ -600,7 +601,7 @@ int main(int argc, char **argv)
break;

case REC_END:
printf("EMIT-INFO : End of data set at record %ld : %s\n", rec.header.num, rec.end.comment);
printf("EMIT-INFO : End of data set at record %d : %s\n", rec.header.num, rec.end.comment);
break;

case REC_POLADO:
Expand Down Expand Up @@ -666,7 +667,7 @@ int main(int argc, char **argv)
i += sizeof(subheadStruct) + nRecEvt * sizeof(ATStruct);

if (i > rec.header.len - sizeof(recordHeaderStruct)) {
printf("Broken record %ld (%ld bytes). Last subhead: siNum=%d Events=%d\n", rec.header.num, rec.header.len, St + 1, nRecEvt);
printf("Broken record %d (%d bytes). Last subhead: siNum=%d Events=%d\n", rec.header.num, rec.header.len, St + 1, nRecEvt);
break;
}

Expand Down Expand Up @@ -727,7 +728,7 @@ int main(int argc, char **argv)
break;

default: // skip any unknown records
printf("Unknown record %8.8lX encountered in input data file\n", rec.header.type & REC_TYPEMASK);
printf("Unknown record %8.8X encountered in input data file\n", rec.header.type & REC_TYPEMASK);
break;
} // switch
} // for(;;)...
Expand Down
1 change: 1 addition & 0 deletions emit/emitsend.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define CDEV_HAS_64BIT_LONGS
#define _FILE_OFFSET_BITS 64 // to handle >2Gb files
#include "rcdev.h"
#include <time.h>
Expand Down
1 change: 1 addition & 0 deletions include/rpoldata.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define POLDATA_H

#include <stdint.h>
#include <string.h>

#include "TBuffer.h"

Expand Down
Binary file modified libcmc/libcmc.o
Binary file not shown.
16 changes: 11 additions & 5 deletions rhic2hbook/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,26 @@
### rhic2hbook : rhic2hbook.o rdatautilp.o rdatautil.o
### $(FC) $^ -Wno-globals -m32 -o $@ $(LIB_PATHS) -lpacklib -lkernlib -lmathlib -lcdev -lm -ldl -lstdc++ $(LIBS)

CERNDIR = ../../cernlib_2006

include /vobs/libs/makefiles/MakeStd.inc

NAME = rhic2hbook

USESOLIBS = yes
INC = -I../include -I/usr/include/cernlib/2006/cfortran
USER_FFLAGS = -m32
USER_CXXFLAGS = $(shell root-config --cflags)
LDFLAGS = -m32 -L/usr/lib/cernlib/2006-g77/lib $(shell root-config --libs)
INC = -I../include -I$(CERNDIR)/include
USER_FFLAGS = -m32 -ffixed-form -ffixed-line-length-none
USER_CXXFLAGS = $(shell $(CERNDIR)/bin/root-config --cflags)
LDFLAGS = -m32 -L$(CERNDIR)/lib $(shell $(CERNDIR)/bin/root-config --libs) -lstdc++
##LDFLAGS = -L$(CERNDIR)/lib $(shell $(CERNDIR)/bin/root-config --libs)

PROG1 = rhic2hbook
SRCS1 = rhic2hbook.f rdatautilp.cpp rdatautil.cpp
LIBS1 = cdevCns cdev includeCdev GenData rhicError Async setHist
LD1 = g77
#LD1 = g77
LD1 = gfortran
FC = gfortran
FF = gfortran
#SYSLIBS1 = packlib kernlib mathlib gfortranbegin gfortran g2c
SYSLIBS1 = packlib kernlib mathlib

Expand Down
5 changes: 5 additions & 0 deletions rhic2hbook/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Main pC-polarimeter analysis code and scripts.
Run in automatic mode by online, but can be run manually
for debugging purposes.

Compiled using clearmake:

cleartool setview igor
clearmake
20 changes: 10 additions & 10 deletions rhic2hbook/TimeStamp.c
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
char* UIAGSVersionDate = "Fri Feb 6 01:37:51 2015";
char* versionDate = "Fri Feb 6 01:37:51 2015";
char* versionDateStr = "date:=Fri Feb 6 01:37:51 2015";
char* UIAGSVersionDate = "Вс 18 фев 2024 14:31:45";
char* versionDate = "Вс 18 фев 2024 14:31:45";
char* versionDateStr = "date:=Вс 18 фев 2024 14:31:45";
char* clearcaseView = "/view/igor";
char* clearcaseViewStr = "view:=/view/igor";
char* clearcaseConfigSpec = "\nelement * CHECKEDOUT\nelement * /main/LATEST\n";
char* clearcaseConfigSpecStr = "configSpec:=element * CHECKEDOUTelement * /main/LATEST";
char* compileFlags = "-I/usr/include -I/usr/include/c++/4.4.7/ -I/usr/include/c++/4.4.7/x86_64-redhat-linux -I/usr/include/c++/4.4.7/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/4.4.7/ -B/usr/libexec/gcc/x86_64-redhat-linux/4.4.7/ -D__X86 -D__WS6 -Wreturn-type -Wno-write-strings -g -pthread";
char* compileFlagsStr = "g++:=-I/usr/include -I/usr/include/c++/4.4.7/ -I/usr/include/c++/4.4.7/x86_64-redhat-linux -I/usr/include/c++/4.4.7/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/4.4.7/ -B/usr/libexec/gcc/x86_64-redhat-linux/4.4.7/ -D__X86 -D__WS6 -Wreturn-type -Wno-write-strings -g -pthread";
char* kernel = "2.6.32-431.23.3.el6.x86_64";
char* kernelstr = "kernel:=2.6.32-431.23.3.el6.x86_64";
char* clearcaseConfigSpec = "\nelement * CHECKEDOUT\nelement * /main/CDEV_LATEST\nelement * /main/LATEST\n";
char* clearcaseConfigSpecStr = "configSpec:=element * CHECKEDOUTelement * /main/CDEV_LATESTelement * /main/LATEST";
char* compileFlags = "-I/cfs/x/usrLocals/WS/glibc-2.28/install/include -I/usr/include -I/usr/include/c++/8 -I/usr/include/c++/8/x86_64-redhat-linux -I/usr/include/c++/8/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/8 -B/usr/libexec/gcc/x86_64-redhat-linux/8 -D__X86 -D__WS8 -Wno-write-strings -g -pthread";
char* compileFlagsStr = "g++:=-I/cfs/x/usrLocals/WS/glibc-2.28/install/include -I/usr/include -I/usr/include/c++/8 -I/usr/include/c++/8/x86_64-redhat-linux -I/usr/include/c++/8/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/8 -B/usr/libexec/gcc/x86_64-redhat-linux/8 -D__X86 -D__WS8 -Wno-write-strings -g -pthread";
char* kernel = "4.18.0-305.17.1.el8_4.x86_64";
char* kernelstr = "kernel:=4.18.0-305.17.1.el8_4.x86_64";
char* node = "acnlinc6.pbn.bnl.gov";
char* nodestr = "node:=acnlinc6.pbn.bnl.gov";
char* OSstr = "OS:=Red Hat Enterprise Linux Workstation release 6.5 (Santiago)";
char* OSstr = "OS:=Red Hat Enterprise Linux release 8.4 (Ootpa)";
4 changes: 2 additions & 2 deletions rhic2hbook/rhic2hbook.f
Original file line number Diff line number Diff line change
Expand Up @@ -1279,8 +1279,8 @@ Function GetRenorm(polName)
fileName = confDir(1:len_trim(confDir))//'/'//
* polName(1:len_trim(polName))//'.normalization'
c print *, 'Correction file:'//fileName(1:len_trim(fileName))
open(unit=20, file=fileName, form='formatted',
* type='old', err=20)
c open(unit=20, file=fileName, form='FORMATTED', type='OLD', err=20)
open(unit=20, file=fileName, form='FORMATTED', err=20, status='OLD')
read (20, *) CORR
close(20)
print *, 'Correction file:'//fileName(1:len_trim(fileName))
Expand Down
7 changes: 5 additions & 2 deletions rhic2root/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CXXFLAGS = $(shell root-config --cflags) -pthread -I../include
LOADLIBES = $(shell root-config --libs)
LDFLAGS = -m32
###LDFLAGS = -m32
#LDFLAGS = -m64
#LD = $(shell root-config --ld)

all : rhic2root

rhic2root : rhic2root.o
Binary file modified rhic2root/rhic2root
Binary file not shown.
6 changes: 4 additions & 2 deletions rhicpol/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
###rhicpol : rpolutilp.o rhicpol.o rpolutil.o ../libcmc/libcmc.o ../rpoldaemon/globals.o ../rpoldaemon/rpoldata.o
###

CERNDIR = ../../cernlib_2006

include /vobs/libs/makefiles/MakeStd.inc

NAME = rhicpol

USESOLIBS = yes
INC = -I../include
USER_CXXFLAGS = $(shell root-config --cflags)
LDFLAGS = ../libcmc/libcmc.o $(shell root-config --libs)
USER_CXXFLAGS = $(shell $(CERNDIR)/bin/root-config --cflags)
LDFLAGS = ../libcmc/libcmc.o $(shell $(CERNDIR)/bin/root-config --libs)

PROG1 = rhicpol
SRCS1 = rhicpol.cpp rpolutil.cpp rpolutilp.cpp globals.cpp rpoldata.cpp
Expand Down
5 changes: 5 additions & 0 deletions rhicpol/README
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
Main online DAQ code. Take data form pC and HJET measurements.
Controls CAMAC and hardware, takes data and writes it to hard drive.

Compiled using clearmake:

cleartool setview igor
clearmake
20 changes: 10 additions & 10 deletions rhicpol/TimeStamp.c
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
char* UIAGSVersionDate = "Tue Mar 10 16:54:12 2015";
char* versionDate = "Tue Mar 10 16:54:12 2015";
char* versionDateStr = "date:=Tue Mar 10 16:54:12 2015";
char* UIAGSVersionDate = "Вс 18 фев 2024 12:14:31";
char* versionDate = "Вс 18 фев 2024 12:14:31";
char* versionDateStr = "date:=Вс 18 фев 2024 12:14:31";
char* clearcaseView = "/view/igor";
char* clearcaseViewStr = "view:=/view/igor";
char* clearcaseConfigSpec = "\nelement * CHECKEDOUT\nelement * /main/LATEST\n";
char* clearcaseConfigSpecStr = "configSpec:=element * CHECKEDOUTelement * /main/LATEST";
char* compileFlags = "-I/usr/include -I/usr/include/c++/4.4.7/ -I/usr/include/c++/4.4.7/x86_64-redhat-linux -I/usr/include/c++/4.4.7/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/4.4.7/ -B/usr/libexec/gcc/x86_64-redhat-linux/4.4.7/ -D__X86 -D__WS6 -Wreturn-type -Wno-write-strings -g -pthread";
char* compileFlagsStr = "g++:=-I/usr/include -I/usr/include/c++/4.4.7/ -I/usr/include/c++/4.4.7/x86_64-redhat-linux -I/usr/include/c++/4.4.7/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/4.4.7/ -B/usr/libexec/gcc/x86_64-redhat-linux/4.4.7/ -D__X86 -D__WS6 -Wreturn-type -Wno-write-strings -g -pthread";
char* kernel = "2.6.32-431.23.3.el6.x86_64";
char* kernelstr = "kernel:=2.6.32-431.23.3.el6.x86_64";
char* clearcaseConfigSpec = "\nelement * CHECKEDOUT\nelement * /main/CDEV_LATEST\nelement * /main/LATEST\n";
char* clearcaseConfigSpecStr = "configSpec:=element * CHECKEDOUTelement * /main/CDEV_LATESTelement * /main/LATEST";
char* compileFlags = "-I/cfs/x/usrLocals/WS/glibc-2.28/install/include -I/usr/include -I/usr/include/c++/8 -I/usr/include/c++/8/x86_64-redhat-linux -I/usr/include/c++/8/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/8 -B/usr/libexec/gcc/x86_64-redhat-linux/8 -D__X86 -D__WS8 -Wno-write-strings -g -pthread";
char* compileFlagsStr = "g++:=-I/cfs/x/usrLocals/WS/glibc-2.28/install/include -I/usr/include -I/usr/include/c++/8 -I/usr/include/c++/8/x86_64-redhat-linux -I/usr/include/c++/8/backward -I/usr/local/share -I/usr/local/share/include -B/usr/lib/gcc/x86_64-redhat-linux/8 -B/usr/libexec/gcc/x86_64-redhat-linux/8 -D__X86 -D__WS8 -Wno-write-strings -g -pthread";
char* kernel = "4.18.0-305.17.1.el8_4.x86_64";
char* kernelstr = "kernel:=4.18.0-305.17.1.el8_4.x86_64";
char* node = "acnlinc6.pbn.bnl.gov";
char* nodestr = "node:=acnlinc6.pbn.bnl.gov";
char* OSstr = "OS:=Red Hat Enterprise Linux Workstation release 6.5 (Santiago)";
char* OSstr = "OS:=Red Hat Enterprise Linux release 8.4 (Ootpa)";
12 changes: 6 additions & 6 deletions rhicpol/rpolutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ int polWrite(recordHeaderStruct *header, long *data)
int irc = fwrite(header, sizeof(recordHeaderStruct), 1, OutFile);

if (irc != 1) {
fprintf(LogFile, "RHICPOL-FATAL : Writing output file error (header) rec=%8.8lX: %s.\n",
fprintf(LogFile, "RHICPOL-FATAL : Writing output file error (header) rec=%8.8X: %s.\n",
header->type, strerror(errno));
polData.statusS |= (STATUS_ERROR | ERR_INT);
fclose(OutFile);
Expand All @@ -794,7 +794,7 @@ int polWrite(recordHeaderStruct *header, long *data)
{
irc = fwrite(data, header->len - sizeof(recordHeaderStruct), 1, OutFile);
if (irc != 1) {
fprintf(LogFile, "RHICPOL-FATAL : Writing output file error (body) rec=%8.8lX: %s.\n",
fprintf(LogFile, "RHICPOL-FATAL : Writing output file error (body) rec=%8.8X: %s.\n",
header->type, strerror(errno));
polData.statusS |= (STATUS_ERROR | ERR_INT);
fclose(OutFile);
Expand Down Expand Up @@ -1452,9 +1452,9 @@ int checkChainResult(CMC_chain *ch, int cr)
mask = CMC_CMASK + CMC_QMASK + CMC_XMASK;
val = (cr << 28) + CMC_QMASK + CMC_XMASK;
err = 0;
for (i = 0; i < ch->rptr; i++) if ((ch->rdata[i] & mask) != val) {
for (i = 0; (signed) i < ch->rptr; i++) if ((ch->rdata[i] & mask) != val) {
err++;
if (iDebug > 200) fprintf(LogFile, "RHICPOL-ERROR : No Q/X/wrong crate number (%d) @%d: %8.8lX.\n",
if (iDebug > 200) fprintf(LogFile, "RHICPOL-ERROR : No Q/X/wrong crate number (%d) @%d: %8.8X.\n",
cr, i, ch->rdata[i]);
}
return err;
Expand Down Expand Up @@ -1509,7 +1509,7 @@ int getNumberOfEvents(void) // Read from WFD dedicated scalers
for (kk = 0; kk < 16; kk += 2) {
if ((ch->rdata[kk + k + ii] & 0xF0000) != kk * 0x10000 ||
(ch->rdata[kk + k + ii + 1] & 0xF0000) != (kk + 1) * 0x10000) {
fprintf(LogFile, "\nRHICPOL-WARN: Wrong dedicated scalers readout at %d.%d.%d@%d: %8.8lX %8.8lX\n",
fprintf(LogFile, "\nRHICPOL-WARN: Wrong dedicated scalers readout at %d.%d.%d@%d: %8.8X %8.8X\n",
cr, i, j + 1, kk, ch->rdata[kk + k + ii], ch->rdata[kk + k + ii + 1]);
}
else {
Expand Down Expand Up @@ -1969,7 +1969,7 @@ void* readThread(void *arg)
case REC_NONE:
if ((w & 0x3F3F) != (Conf.CSR.reg & 0x3F3F)) {
if (iDebug > 200) fprintf(LogFile,
"RHICPOL-ERR : WFD %d.%d CSR %4.4X found @ %X (EXP: %4.4lX)\n",
"RHICPOL-ERR : WFD %d.%d CSR %4.4X found @ %X (EXP: %4.4X)\n",
cr, i, w, 2 * j, Conf.CSR.reg);
err++;
continue;
Expand Down
2 changes: 1 addition & 1 deletion rhicpol/rpolutilp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void getCdevInfo()
}

memset(ival, 0, sizeof(ival));
sprintf(defName, "polarControlDefaults%s", &DeviceName[11]);
snprintf(defName, sizeof(defName), "polarControlDefaults%s", &DeviceName[11]);
cdevDevice & def = cdevDevice::attachRef(defName);
if (!DEVSEND(def, "get rampInterval", NULL, &data, LogFile, irc)) data.get("value", ival);
if (ival[tgtId] < 0) ival[tgtId] = 2; // just default
Expand Down
6 changes: 4 additions & 2 deletions rpoldaemon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
### rpoldaemon: rpoldaemon.o globals.o rpoldata.o
### cnidaemon: cnidaemon.o globals.o rpoldata.o

CERNDIR = ../../cernlib_2006

include /vobs/libs/makefiles/MakeStd.inc

NAME = rhicpol

USESOLIBS = yes
INC = -I../include
USER_CXXFLAGS = $(shell root-config --cflags)
LDFLAGS = $(shell root-config --libs)
USER_CXXFLAGS = $(shell $(CERNDIR)/bin/root-config --cflags)
LDFLAGS = $(shell $(CERNDIR)/bin/root-config --libs)

PROG1 = rpoldaemon
SRCS1 = rpoldaemon.cpp globals.cpp rpoldata.cpp
Expand Down
5 changes: 5 additions & 0 deletions rpoldaemon/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Online pC-polarimeters daemon. Hooks CDEV variable dataAcquisitionS and
process changing of this variable to start/stop polarimeter measurement.
Rebuild with cmake.

Compiled using clearmake:

cleartool setview igor
clearmake
Loading

0 comments on commit 1312312

Please sign in to comment.