Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 171 → Rev 172

/lab/sipmscan/trunk/include/sipmscan.h
48,6 → 48,7
void layoutMainWindow(int *w, int *h);
void SeqNumber(int innum, int maxnum, char *outstr);
void TimeEstimate(clock_t stopw0, time_t time0, float progress, char *retEstim, int offset);
void TimeEstimateNew(int nr, clock_t stopw0, time_t time0, int rX, int rY, int rZ, int xWait, int yWait, int zWait, char *retEstim);
void NormateSet(int file, int nrpoint, double *min, double *max, double *setCount, double *setAcc);
double PointEstimate(int nrp, double *points);
// Separate functions -----------------------------------------
129,6 → 130,9
void LayoutSave();
void LayoutSet();
void ToolTipSet();
void ToolTipSetSurfaceScan();
void ToolTipSetRelativePDE();
void ToolTipSetTempAnalysis();
 
// Subframes where we display everything
TGCompositeFrame *measLayout[measwin];
299,9 → 303,15
TSubStructure *runningOff;
TSubStructure *secondAxis;
TSubStructure *exportExitAnalysis;
 
TSubStructure *xCrop;
TSubStructure *yCrop;
TSubStructure *interpolSize;
TSubStructure *updateCrop;
// Action connections for temporary analysis edit window (new tab)
void ApplyRunningAver();
void UpdateIntegrateSurface(int val);
void CloseTempAnalysisTab(int tabval);
void ExportTempAnalysisPlot();
 
312,8 → 322,9
void RunMeas(void *ptr, int runCase, int &scanon);
int MyTimer();
 
// Open directory
char *currentOpenDir;
// Open directory (separate for saving measurement and for opening histograms)
char *currentMeasDir;
char *currentAnalDir;
 
// ROOT file variable structure -------------------------------
struct EventHeader {