| /lab/sipmscan/trunk/input/start.sh.online |
|---|
| File deleted |
| Property changes: |
| Deleted: svn:executable |
| ## -1 +0,0 ## |
| -* |
| \ No newline at end of property |
| Index: start.sh.offline |
| =================================================================== |
| --- start.sh.offline (revision 127) |
| +++ start.sh.offline (nonexistent) |
| @@ -1,12 +0,0 @@ |
| -#!/bin/bash |
| -dir=`dirname $0` |
| - |
| -#source /opt/root/bin/thisroot.sh # only for operation with IJS |
| - |
| -if [ ! -d results ]; then |
| - mkdir results |
| -fi |
| - |
| -root -l "$dir/start.cxx(\"$dir\")" |
| - |
| - |
| /start.sh.offline |
|---|
| Property changes: |
| Deleted: svn:executable |
| ## -1 +0,0 ## |
| -* |
| \ No newline at end of property |
| Index: Makefile.in |
| =================================================================== |
| --- Makefile.in (revision 127) |
| +++ Makefile.in (revision 129) |
| @@ -7,7 +7,7 @@ |
| # Includes, 32 vs. 64 bit type, libraries |
| INC=-I. -I$(ROOTINC) |
| -OSTYPE = $(shell uname -p) |
| +OSTYPE=none |
| LIBS=$(ROOTLIB) -L./ -lm |
| # Source and debug prefixes |
| @@ -53,15 +53,15 @@ |
| libxxusb.o: libxxusb.cpp libxxusb.h |
| .cc.o: |
| - $(CXX) -c $< |
| + $(CXX) -fPIC -c $< |
| ar r $(LIBFILE) $@ |
| .cpp.o: |
| - $(CXX) -c $< |
| + $(CXX) -fPIC -c $< |
| ar r $(LIBFILE) $@ |
| .c.o: |
| - $(CXX) -c $< |
| + $(CXX) -fPIC -c $< |
| ar r $(LIBFILE) $@ |
| # Rules for recreating the CAMAC DAQ libraries even if they exist (libdaqusb.so/.a) |
| /lab/sipmscan/trunk/input/daqscope.C.in |
|---|
| 231,6 → 231,7 |
| vxi11_receive(clink, posoff, WAVE_LEN); |
| choffset = (double)atof(posoff); |
| #else |
| sprintf(posoff, "Just some temporary string info."); |
| printf("Check for channel position offset (CHx:POS?)\n"); |
| #endif |
| /lab/sipmscan/trunk/input/daqusb.C.offline |
|---|
| 48,7 → 48,7 |
| return 0; |
| } |
| int daq::init(){ |
| int daq::init(int chan = 0){ |
| // int i; |
| // long k; |
| 60,6 → 60,20 |
| CCCC; |
| CREM_I; |
| NTDC = 1; |
| NADC = 2; |
| if(chan != 0) |
| { |
| NTDCCH = chan/2; |
| NADCCH = chan/2; |
| } |
| else |
| { |
| NTDCCH = 1; |
| NADCCH = 1; |
| } |
| printf("after: NTDCCH = %d, NADCCH = %d\n", NTDCCH, NADCCH); |
| // create command stack for the TDC and ADC |
| k=1; |
| for(i=0;(i<NTDCCH)&&(i<NADCCH);i++) { stackwrite[k++]=NAF(NTDC,i,0); stackwrite[k++]=NAF(NADC,i,0); } |
| 119,7 → 133,7 |
| } |
| int daq::event(unsigned int *data, int maxn){ |
| // int i,ib,count; |
| // int ib,count; |
| int count; |
| /* int events,evsize; |
| short ret; |
| 136,7 → 150,7 |
| DBG(printf("Event:%d EvSize:%d\n", events, evsize);) |
| for (int i=0;i<(NTDCCH+NADCCH);i++,ib++) data[count++] =stackdata[ib++]&0xffff; |
| if (stackdata[ib++]!=0xfafb){ |
| printf("Error!\n"); |
| printf("Error!\n");, |
| return 0; |
| } |
| events--; |
| 161,8 → 175,8 |
| daq::daq(){ |
| fStop=0; |
| connect(); |
| if(devDetect > 0) |
| init(); |
| // if(devDetect > 0) |
| // init(); |
| } |
| daq::~daq(){ |
| 190,7 → 204,7 |
| // intercept routine |
| if (signal (SIGINT, CatchSig) == SIG_ERR) perror ("sigignore"); |
| if (signal (SIGINT, CatchSig) == SIG_E,RR) perror ("sigignore"); |
| #define BSIZE 10000 |
| int i,ieve,nc,nb; |
| 198,8 → 212,8 |
| int hdr[4]={1,(NTDCCH+NADCCH+4)*sizeof(int)}; |
| unsigned short adc; |
| unsigned int data[BSIZE]; |
| daq *d= new daq(); |
| time_t time_check; |
| daq *d= new daq();, |
| time_t time_check;, |
| // odpremo datoteko za pisanje |
| FILE *fp=fopen(fname,"w"); |
| /lab/sipmscan/trunk/input/daqusb.C.online |
|---|
| 26,7 → 26,7 |
| //#define NADCCH 8 |
| int ctrlc=0; |
| char *ccserial=(char*)"CC0126"; |
| int devDetect; // variable to tell if we detect any devices |
| //int devDetect; // variable to tell if we detect any devices |
| int daq::connect(){ |
| // odpri daq |
| 48,7 → 48,7 |
| return 0; |
| } |
| int daq::init(){ |
| int daq::init(int chan = 0){ |
| int i; |
| long k; |
| 60,6 → 60,20 |
| CCCC; |
| CREM_I; |
| NTDC = 1; |
| NADC = 2; |
| if(chan != 0) |
| { |
| NTDCCH = chan/2; |
| NADCCH = chan/2; |
| } |
| else |
| { |
| NTDCCH = 1; |
| NADCCH = 1; |
| } |
| printf("after: NTDCCH = %d, NADCCH = %d\n", NTDCCH, NADCCH); |
| // create command stack for the TDC and ADC |
| k=1; |
| for(i=0;(i<NTDCCH)&&(i<NADCCH);i++) { stackwrite[k++]=NAF(NTDC,i,0); stackwrite[k++]=NAF(NADC,i,0); } |
| 119,7 → 133,7 |
| } |
| int daq::event(unsigned int *data, int maxn){ |
| int i,ib,count; |
| int ib,count; |
| int events,evsize; |
| short ret; |
| 160,8 → 174,8 |
| daq::daq(){ |
| fStop=0; |
| connect(); |
| if(devDetect > 0) |
| init(); |
| // if(devDetect > 0) |
| // init(); |
| } |
| daq::~daq(){ |
| /lab/sipmscan/trunk/input/start.sh.in |
|---|
| 0,0 → 1,23 |
| if [ $rootdirectory != -1 ]; then |
| printenv ROOTSYS > /dev/null |
| if [ $? != 0 ]; then |
| echo "Preparing ROOT..." |
| source $rootdirectory/bin/thisroot.sh |
| fi |
| fi |
| if [ $snmpdirectory != -1 ]; then |
| printenv PATH | grep "snmp" > /dev/null |
| if [ $? != 0 ]; then |
| echo "Preparing NET-SNMP..." |
| export PATH=$snmpdirectory/bin:$PATH |
| fi |
| fi |
| if [ ! -d results ]; then |
| mkdir results |
| fi |
| root -l "$dir/start.cxx(\"$dir\")" |
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: workstation.h.in |
| =================================================================== |
| --- workstation.h.in (revision 127) |
| +++ workstation.h.in (revision 129) |
| @@ -1,9 +1,12 @@ |
| #ifndef _workstation_h_ |
| #define _workstation_h_ |
| -// Define the working computer (O=offline, I=IJS/online) and the base directory |
| +// Define the working computer (O=offline, S=offline with scope, I=IJS/online) and the base directory |
| #define WORKSTAT 'N' |
| +// Define if working computer is connected to IJS ethernet network (for fieldpoint) |
| +#define IJSNET 1 |
| + |
| #ifdef WORKSTAT |
| #define rootdir "path-to-installation" |
| #endif |