Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 126 → Rev 127

/lab/sipmscan/trunk/daqscope.h
6,10 → 6,32
//class VmUsbStack;
class daqscope {
public:
int scopeUseType;
int scopeChanNr;
int scopeChans[8];
char scopeChanstring[256];
int scopeMeasSel;
char eventbuf[WAVE_LEN];
double measubuf;
double tektime, tekvolt;
double choffset;
 
int fStop;
double tekunit(char *prefix);
 
int init();
int event();
int customCommand(char *command, bool query, char *sReturn);
int connect(char* IPaddr);
int disconnect(char* IPaddr);
int lockunlock(bool lockit);
daqscope();
~daqscope();
 
// VmUsbStack * fStack;
// VmUsbStack * fInit;
 
int OSrepetition;
/* int OSrepetition;
int OSmeasu;
int OSmeasuchan;
int OSgating;
27,8 → 49,8
char multibuf[WAVE_LEN];
char eventbuf[WAVE_LEN];
double tektime,tekvolt,lctime,lcvolt;
int fastacqstate; /* GKM - variable that saves the fastacq state */
double choffset; /* GKM - position offset for signal */
int fastacqstate; // GKM - variable that saves the fastacq state
double choffset; // GKM - position offset for signal
 
int fPoints;
int fStop;
47,7 → 69,7
void fileopen(const char*);
void fileclose();
void countcontrol();
void fastacq(int setting); /* GKM - gets tek out of fastacq*/
void fastacq(int setting); // GKM - gets tek out of fastacq
void header();
void measuheader();
void lecroyheader();
56,7 → 78,7
double lcunit(char*);
daqscope();
// daqscope(const char *);
~daqscope();
~daqscope();*/
};
 
#endif