Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 31 → Rev 32

/sipmScan/sipmThreshold.prj
1,7 → 1,7
[Project Header]
Version = 551
Platform Code = 4
Pathname = "/c/HOME/dino/l2d/sipmThreshold.prj"
Pathname = "/c/HOME/dino/sipmScan/sipmThreshold.prj"
CVI Dir = "/c/measurementstudio/cvi"
VXIplug&play Framework Dir = "/C/VXIpnp/winnt"
Number of Files = 9
18,10 → 18,10
 
[File 0001]
File Type = "User Interface Resource"
Path = "/c/HOME/dino/l2d/include/sipmThreshold_ui.uir"
Path = "/c/HOME/dino/sipmScan/include/sipmThreshold_ui.uir"
Res Id = 1
Exclude = False
Disk Date = 3478361857
Disk Date = 3479104556
Project Flags = 0
Window Top = 94
Window Left = 42
30,29 → 30,29
 
[File 0002]
File Type = "CSource"
Path = "/c/HOME/dino/l2d/src/sipmThreshold.c"
Path = "/c/HOME/dino/sipmScan/src/sipmThreshold.c"
Res Id = 2
Exclude = False
Disk Date = 3478362979
Disk Date = 3479104436
Project Flags = 0
Compile Into Object File = False
Object Format = "Win32-MSVC"
ForceCompile_Debug = False
ForceCompile_Release = True
Window Top = 109
Window Left = 443
Window Top = 88
Window Left = 244
Window Height = 0
Window Width = 0
Source Window State = "1,349,349,349,0,29,30,0,0,108,0,0,0,0,0,55,364,0,406,23,"
Source Window State = "1,349,349,349,0,29,30,0,0,108,0,0,0,0,0,55,512,0,539,36,"
Header Dependencies Line0001 = "1,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,27,29,30,31,32,3"
Header Dependencies Line0002 = "3,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,55,56,57,58,"
 
[File 0003]
File Type = "Include"
Path = "/c/HOME/dino/l2d/include/sipmThreshold_ui.h"
Path = "/c/HOME/dino/sipmScan/include/sipmThreshold_ui.h"
Res Id = 3
Exclude = False
Disk Date = 3477041806
Disk Date = 3477045406
Project Flags = 0
Window Top = 324
Window Left = 162
62,10 → 62,10
 
[File 0004]
File Type = "Include"
Path = "/c/HOME/dino/l2d/include/camac.h"
Path = "/c/HOME/dino/sipmScan/include/camac.h"
Res Id = 4
Exclude = False
Disk Date = 3261990551
Disk Date = 3261994151
Project Flags = 0
Window Top = 0
Window Left = 0
78,10 → 78,10
Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
Res Id = 5
Exclude = False
Disk Date = 3263048972
Disk Date = 3263052572
Project Flags = 0
Window Top = 0
Window Left = 0
Window Top = 152
Window Left = 70
Window Height = 0
Window Width = 0
Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
91,7 → 91,7
Path = "/c/MeasurementStudio/cvi/instr/MIKRO/MIKRO.fp"
Res Id = 6
Exclude = False
Disk Date = 3228636098
Disk Date = 3228639698
Project Flags = 0
Window Top = 0
Window Left = 0
103,7 → 103,7
Path = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A.fp"
Res Id = 7
Exclude = False
Disk Date = 3244091108
Disk Date = 3244094708
Project Flags = 0
Window Top = 0
Window Left = 0
115,7 → 115,7
Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.fp"
Res Id = 8
Exclude = False
Disk Date = 3258260654
Disk Date = 3258264254
Project Flags = 0
Window Top = 0
Window Left = 0
127,7 → 127,7
Path = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.fp"
Res Id = 9
Exclude = False
Disk Date = 3243838534
Disk Date = 3243842134
Project Flags = 0
Window Top = 0
Window Left = 0
180,25 → 180,21
[Include Paths]
Include Path 1 = "/c/MeasurementStudio/cvi/instr/PCIVME_DLL"
Include Path 2 = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL"
Include Path 3 = "/c/HOME/dino/l2d/include"
Include Path 3 = "/c/HOME/dino/sipmScan/include"
 
[Included Headers]
Header 0058 = "/c/HOME/dino/l2d/include/sipmThreshold_ui.h"
Header 0055 = "/c/HOME/dino/l2d/include/camac.h"
Header 0029 = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
Header 0059 = "/c/HOME/dino/sipmScan/include/sipmScan_ui.h"
Header 0058 = "/c/HOME/dino/sipmScan/include/camac.h"
Header 0001 = "/c/MeasurementStudio/cvi/include/utility.h"
Header 0002 = "/c/MeasurementStudio/cvi/include/cvidef.h"
Header 0003 = "/c/MeasurementStudio/cvi/include/cvirte.h"
Header 0005 = "/c/MeasurementStudio/cvi/include/ansi_c.h"
Header 0006 = "/c/MeasurementStudio/cvi/include/ansi/assert.h"
Header 0007 = "/c/MeasurementStudio/cvi/include/ansi/ctype.h"
Header 0008 = "/c/MeasurementStudio/cvi/include/ansi/errno.h"
Header 0009 = "/c/MeasurementStudio/cvi/include/ansi/float.h"
Header 0010 = "/c/MeasurementStudio/cvi/include/ansi/limits.h"
Header 0011 = "/c/MeasurementStudio/cvi/include/ansi/locale.h"
Header 0012 = "/c/MeasurementStudio/cvi/include/ansi/math.h"
Header 0013 = "/c/MeasurementStudio/cvi/include/ansi/setjmp.h"
Header 0014 = "/c/MeasurementStudio/cvi/include/ansi/signal.h"
Header 0015 = "/c/MeasurementStudio/cvi/include/ansi/stdarg.h"
Header 0016 = "/c/MeasurementStudio/cvi/include/ansi/stddef.h"
Header 0017 = "/c/MeasurementStudio/cvi/include/ansi/stdio.h"
209,7 → 205,6
Header 0022 = "/c/MeasurementStudio/cvi/include/ivi.h"
Header 0023 = "/c/MeasurementStudio/cvi/include/visa.h"
Header 0024 = "/c/MeasurementStudio/cvi/include/visatype.h"
Header 0025 = "/c/MeasurementStudio/cvi/include/vpptype.h"
Header 0027 = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A.h"
Header 0030 = "/c/MeasurementStudio/cvi/sdk/include/windows.h"
Header 0031 = "/c/MeasurementStudio/cvi/sdk/include/windef.h"
216,23 → 211,11
Header 0032 = "/c/MeasurementStudio/cvi/sdk/include/winnt.h"
Header 0033 = "/c/MeasurementStudio/cvi/sdk/include/basetsd.h"
Header 0034 = "/c/MeasurementStudio/cvi/sdk/include/Guiddef.h"
Header 0035 = "/c/MeasurementStudio/cvi/sdk/include/pshpack4.h"
Header 0036 = "/c/MeasurementStudio/cvi/sdk/include/poppack.h"
Header 0037 = "/c/MeasurementStudio/cvi/sdk/include/pshpack2.h"
Header 0038 = "/c/MeasurementStudio/cvi/sdk/include/pshpack8.h"
Header 0039 = "/c/MeasurementStudio/cvi/sdk/include/winbase.h"
Header 0040 = "/c/MeasurementStudio/cvi/sdk/include/winerror.h"
Header 0041 = "/c/MeasurementStudio/cvi/sdk/include/wingdi.h"
Header 0042 = "/c/MeasurementStudio/cvi/sdk/include/pshpack1.h"
Header 0043 = "/c/MeasurementStudio/cvi/sdk/include/winuser.h"
Header 0044 = "/c/MeasurementStudio/cvi/sdk/include/tvout.h"
Header 0045 = "/c/MeasurementStudio/cvi/sdk/include/winnls.h"
Header 0046 = "/c/MeasurementStudio/cvi/sdk/include/wincon.h"
Header 0047 = "/c/MeasurementStudio/cvi/sdk/include/winver.h"
Header 0048 = "/c/MeasurementStudio/cvi/sdk/include/winreg.h"
Header 0049 = "/c/MeasurementStudio/cvi/sdk/include/winnetwk.h"
Header 0050 = "/c/MeasurementStudio/cvi/sdk/include/winsvc.h"
Header 0051 = "/c/MeasurementStudio/cvi/sdk/include/mcx.h"
Header 0052 = "/c/MeasurementStudio/cvi/sdk/include/imm.h"
Header 0053 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.h"
Header 0056 = "/c/MeasurementStudio/cvi/include/userint.h"
241,13 → 224,31
Header 0026 = "/c/MeasurementStudio/cvi/include/rs232.h"
Header 0028 = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A_DEF.h"
Header 0054 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462_DEF.h"
Max Header Number = 58
Header 0055 = "/c/HOME/dino/sipmScan/include/sipmThreshold_ui.h"
Header 0006 = "/c/MeasurementStudio/cvi/include/ansi/assert.h"
Header 0010 = "/c/MeasurementStudio/cvi/include/ansi/limits.h"
Header 0012 = "/c/MeasurementStudio/cvi/include/ansi/math.h"
Header 0014 = "/c/MeasurementStudio/cvi/include/ansi/signal.h"
Header 0025 = "/c/MeasurementStudio/cvi/include/vpptype.h"
Header 0035 = "/c/MeasurementStudio/cvi/sdk/include/pshpack4.h"
Header 0036 = "/c/MeasurementStudio/cvi/sdk/include/poppack.h"
Header 0037 = "/c/MeasurementStudio/cvi/sdk/include/pshpack2.h"
Header 0038 = "/c/MeasurementStudio/cvi/sdk/include/pshpack8.h"
Header 0040 = "/c/MeasurementStudio/cvi/sdk/include/winerror.h"
Header 0042 = "/c/MeasurementStudio/cvi/sdk/include/pshpack1.h"
Header 0044 = "/c/MeasurementStudio/cvi/sdk/include/tvout.h"
Header 0046 = "/c/MeasurementStudio/cvi/sdk/include/wincon.h"
Header 0047 = "/c/MeasurementStudio/cvi/sdk/include/winver.h"
Header 0048 = "/c/MeasurementStudio/cvi/sdk/include/winreg.h"
Header 0049 = "/c/MeasurementStudio/cvi/sdk/include/winnetwk.h"
Header 0051 = "/c/MeasurementStudio/cvi/sdk/include/mcx.h"
Max Header Number = 59
 
[Create Executable]
Executable File_Debug = "/c/HOME/dino/l2d/sipmThr_dbg.exe"
Target Creation Date_Debug = 3478365487
Executable File_Debug = "/c/HOME/dino/sipmScan/sipmThr_dbg.exe"
Target Creation Date_Debug = 3479104583
Force Creation of Target_Debug = False
Executable File_Release = "/c/HOME/dino/l2d/l2d.exe"
Executable File_Release = "/c/HOME/dino/sipmScan/sipmThr.exe"
Target Creation Date_Release = 0
Force Creation of Target_Release = True
Icon File = ""
/sipmScan/include/sipmThreshold_ui.uir
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/sipmScan/pcivme_ni.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: sipmScan.prj
===================================================================
--- sipmScan.prj (revision 31)
+++ sipmScan.prj (revision 32)
@@ -1,10 +1,10 @@
[Project Header]
Version = 551
Platform Code = 4
-Pathname = "/c/HOME/dino/l2d/sipmScan.prj"
+Pathname = "/c/HOME/dino/sipmScan/sipmScan.prj"
CVI Dir = "/c/measurementstudio/cvi"
VXIplug&play Framework Dir = "/C/VXIpnp/winnt"
-Number of Files = 8
+Number of Files = 9
Sort Type = "No Sort"
Target Type = "Executable"
Build Configuration = "Debug"
@@ -21,13 +21,13 @@
Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
Res Id = 1
Exclude = False
-Disk Date = 3263048972
+Disk Date = 3263052572
Project Flags = 0
-Window Top = 0
-Window Left = 0
+Window Top = 152
+Window Left = 70
Window Height = 0
Window Width = 0
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+Source Window State = "1,0,0,0,0,0,0,0,0,103,0,0,0,0,0,39,0,0,0,0,"
[File 0002]
File Type = "Function Panel"
@@ -34,7 +34,7 @@
Path = "/c/MeasurementStudio/cvi/instr/MIKRO/MIKRO.fp"
Res Id = 2
Exclude = False
-Disk Date = 3228636098
+Disk Date = 3228639698
Project Flags = 0
Window Top = 0
Window Left = 0
@@ -43,10 +43,10 @@
[File 0003]
File Type = "Include"
-Path = "/c/HOME/dino/l2d/include/sipmScan_ui.h"
+Path = "/c/HOME/dino/sipmScan/include/sipmScan_ui.h"
Res Id = 3
Exclude = False
-Disk Date = 3474463671
+Disk Date = 3474467271
Project Flags = 0
Window Top = 122
Window Left = 54
@@ -56,29 +56,29 @@
[File 0004]
File Type = "CSource"
-Path = "/c/HOME/dino/l2d/src/sipmScan.c"
+Path = "/c/HOME/dino/sipmScan/src/sipmScan.c"
Res Id = 4
Exclude = False
-Disk Date = 3478946031
+Disk Date = 3479103988
Project Flags = 0
Compile Into Object File = False
Object Format = "Win32-MSVC"
ForceCompile_Debug = False
ForceCompile_Release = True
-Window Top = 92
-Window Left = 38
+Window Top = 120
+Window Left = 174
Window Height = 0
Window Width = 0
-Source Window State = "1,0,0,0,0,0,0,0,0,125,0,0,0,0,0,52,0,0,32,16,"
+Source Window State = "1,251,251,251,8,60,61,0,0,125,0,0,0,0,0,52,234,0,260,62,"
Header Dependencies Line0001 = "1,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,27,29,30,31,32,3"
-Header Dependencies Line0002 = "3,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,55,56,58,59,"
+Header Dependencies Line0002 = "3,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,56,57,58,59,"
[File 0005]
File Type = "User Interface Resource"
-Path = "/c/HOME/dino/l2d/include/sipmScan_ui.uir"
+Path = "/c/HOME/dino/sipmScan/include/sipmScan_ui.uir"
Res Id = 5
Exclude = False
-Disk Date = 3478365379
+Disk Date = 3478368979
Project Flags = 0
Window Top = 152
Window Left = 70
@@ -86,23 +86,24 @@
Window Width = 1248
[File 0006]
-File Type = "Function Panel"
-Path = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A.fp"
+File Type = "Include"
+Path = "/c/HOME/dino/sipmScan/include/camac.h"
Res Id = 6
Exclude = False
-Disk Date = 3244091108
+Disk Date = 3261994151
Project Flags = 0
Window Top = 0
Window Left = 0
Window Height = 0
Window Width = 0
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
[File 0007]
File Type = "Function Panel"
-Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.fp"
+Path = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A.fp"
Res Id = 7
Exclude = False
-Disk Date = 3258260654
+Disk Date = 3244094708
Project Flags = 0
Window Top = 0
Window Left = 0
@@ -111,10 +112,10 @@
[File 0008]
File Type = "Function Panel"
-Path = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.fp"
+Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.fp"
Res Id = 8
Exclude = False
-Disk Date = 3243838534
+Disk Date = 3258264254
Project Flags = 0
Window Top = 0
Window Left = 0
@@ -121,6 +122,18 @@
Window Height = 0
Window Width = 0
+[File 0009]
+File Type = "Function Panel"
+Path = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.fp"
+Res Id = 9
+Exclude = False
+Disk Date = 3243842134
+Project Flags = 0
+Window Top = 0
+Window Left = 0
+Window Height = 0
+Window Width = 0
+
[SCC Options]
Use global settings = True
SCC Provider = ""
@@ -167,10 +180,12 @@
[Include Paths]
Include Path 1 = "/c/MeasurementStudio/cvi/instr/PCIVME_DLL"
Include Path 2 = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL"
-Include Path 3 = "/c/HOME/dino/l2d/include"
+Include Path 3 = "/c/HOME/dino/sipmScan/include"
[Included Headers]
Header 0029 = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
+Header 0059 = "/c/HOME/dino/sipmScan/include/sipmScan_ui.h"
+Header 0058 = "/c/HOME/dino/sipmScan/include/camac.h"
Header 0001 = "/c/MeasurementStudio/cvi/include/utility.h"
Header 0002 = "/c/MeasurementStudio/cvi/include/cvidef.h"
Header 0003 = "/c/MeasurementStudio/cvi/include/cvirte.h"
@@ -220,22 +235,19 @@
Header 0051 = "/c/MeasurementStudio/cvi/sdk/include/mcx.h"
Header 0052 = "/c/MeasurementStudio/cvi/sdk/include/imm.h"
Header 0053 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.h"
-Header 0055 = "/c/MeasurementStudio/cvi/include/userint.h"
-Header 0056 = "/c/MeasurementStudio/cvi/include/analysis.h"
-Header 0057 = "/c/HOME/dino/l2d/camac.h"
+Header 0056 = "/c/MeasurementStudio/cvi/include/userint.h"
+Header 0057 = "/c/MeasurementStudio/cvi/include/analysis.h"
Header 0004 = "/c/MeasurementStudio/cvi/include/formatio.h"
Header 0026 = "/c/MeasurementStudio/cvi/include/rs232.h"
Header 0028 = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A_DEF.h"
Header 0054 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462_DEF.h"
-Header 0059 = "/c/HOME/dino/l2d/include/sipmScan_ui.h"
-Header 0058 = "/c/HOME/dino/l2d/include/camac.h"
Max Header Number = 59
[Create Executable]
-Executable File_Debug = "/c/HOME/dino/l2d/sipmScan_dbg.exe"
-Target Creation Date_Debug = 3478946033
+Executable File_Debug = "/c/HOME/dino/sipmScan/sipmScan_dbg.exe"
+Target Creation Date_Debug = 3479103989
Force Creation of Target_Debug = False
-Executable File_Release = "/c/HOME/dino/l2d/l2d.exe"
+Executable File_Release = "/c/HOME/dino/sipmScan/sipmScan.exe"
Target Creation Date_Release = 0
Force Creation of Target_Release = True
Icon File = ""
/sipmScan/src/sipmThreshold.c
5,7 → 5,7
// Options->CompilerDefines (dodaj /DSISVME ali /DWIENVME)
#ifdef USE_DAQ
# define USE_CAMAC
#include "c:\HOME\dino\l2d\include\camac.h"
#include "c:\HOME\dino\sipmScan\include\camac.h"
# ifdef SISVME
# include "sisvme_dll.h"
# endif
25,7 → 25,7
#include <utility.h>
#include <analysis.h>
 
#include "c:\HOME\dino\l2d\include\sipmThreshold_ui.h"
#include "c:\HOME\dino\sipmScan\include\sipmThreshold_ui.h"
 
#ifdef USE_DAQ
# define USE_CAMAC
537,7 → 537,7
#endif
#endif
 
if ((p1h = LoadPanel (0, "sipmThreshold_ui.uir", P1)) < 0) return -1;
if ((p1h = LoadPanel (0, "include/sipmThreshold_ui.uir", P1)) < 0) return -1;
DisplayPanel (p1h);
SetCtrlAttribute (p1h, P1_PLCH, ATTR_MAX_VALUE, NCH-1);
/sipmScan/src/sipmScan.c
5,7 → 5,7
// Options->CompilerDefines (dodaj /DSISVME ali /DWIENVME)
#ifdef USE_DAQ
# define USE_CAMAC
# include "c:\HOME\dino\l2d\include\camac.h"
# include "c:\HOME\dino\sipmScan\include\camac.h"
# ifdef SISVME
# include "sisvme_dll.h"
# endif
25,7 → 25,7
#include <utility.h>
#include <analysis.h>
 
#include "c:\HOME\dino\l2d\include\sipmScan_ui.h"
#include "c:\HOME\dino\sipmScan\include\sipmScan_ui.h"
 
#ifdef USE_DAQ
# define USE_CAMAC
246,12 → 246,11
posrec.xset = runrec.x0 + posrec.ix*runrec.dx;
#ifdef USE_MIKRO
do {
//printf("MIKRO_MoveTo (1, x);%d\n",posrec.xset);
if (print) printf("MIKRO_MoveTo (1, x);%d\n",posrec.xset);
MIKRO_MoveTo (MIKRO_X, posrec.xset);
MIKRO_GetPosition(MIKRO_X, &mikroX);
printf("%d\n", abs(posrec.xset - mikroX));
if (print) printf("%d\n", abs(posrec.xset - mikroX));
} while (abs(posrec.xset - mikroX) > STEP_TOLERANCE);
// printf("->MIKRO_MoveTo (1, x);%d\n",posrec.xset);
#endif
posrec.xset = mikroX; // true value
SetCtrlVal (p1h, P1_X, posrec.xset);
259,12 → 258,13
for (posrec.iy=0; posrec.iy<runrec.ny; posrec.iy++) {
posrec.yset = runrec.y0 + posrec.iy*runrec.dy;
#ifdef USE_MIKRO_Y
//printf("MIKRO_MoveTo (2, y);%d\n",y);
if (print) printf("MIKRO_MoveTo (2, y);%d\n",posrec.yset);
do {
MIKRO_MoveTo (MIKRO_Y, posrec.yset);
MIKRO_GetPosition(MIKRO_Y, &mikroY);
if (print) printf("%d\n", abs(posrec.yset - mikroY));
} while (abs(posrec.yset - mikroY) > STEP_TOLERANCE);
// printf("->MIKRO_MoveTo (2, y);%d\n",posrec.yset);
if (print) printf("->MIKRO_MoveTo (2, y);%d\n",posrec.yset);
#endif
posrec.yset = mikroY;
SetCtrlVal (p1h, P1_Y, posrec.yset);