diff --git a/src/hispecatc/hispecatc.def b/src/hispecatc/hispecatc.def index 672a3e4..984a090 100644 --- a/src/hispecatc/hispecatc.def +++ b/src/hispecatc/hispecatc.def @@ -36,6 +36,6 @@ #define _RAW_SELECT 0 /* AD channel for raw data capture */ #define _FIRST_RESET_SAMPLE 256 -#define _LAST_RESET_SAMPLE 992 -#define _FIRST_VIDEO_SAMPLE 1000 -#define _LAST_VIDEO_SAMPLE 1000 +#define _LAST_RESET_SAMPLE 692 +#define _FIRST_VIDEO_SAMPLE 700 +#define _LAST_VIDEO_SAMPLE 700 diff --git a/src/hispecatc/hispecatc.modes b/src/hispecatc/hispecatc.modes index f5407e0..f60c82d 100755 --- a/src/hispecatc/hispecatc.modes +++ b/src/hispecatc/hispecatc.modes @@ -9,6 +9,13 @@ ACF:TAPLINE2="AM29L,1,0" ACF:TAPLINE3="AM31R,1,0" ACF:TAPLINE4="AM52L,1,0" ACF:TAPLINES=5 +ACF:mode_FreerunRX=0 +ACF:mode_FreerunRXR=0 +ACF:mode_UTR_RR=0 +ACF:mode_UTR_GR=0 +ACF:mode_RX=0 +ACF:mode_RXR=0 +ACF:mode_Guiding=0 ARCH:HORI_AMPS=5 ARCH:NUM_DETECT=1 ARCH:VERT_AMPS=1 @@ -26,6 +33,7 @@ ARCH:VERT_AMPS=1 ARCH:HORI_AMPS=2 ACF:PIXELCOUNT=618 ACF:LINECOUNT=618 +ACF:mode_Guiding=1 FITS:READOUTMODE=Guiding [MODE_UTR_RR] ACF:FRAMEMODE=1 @@ -41,6 +49,7 @@ ACF:RAWENABLE=0 ARCH:HORI_AMPS=3 ARCH:NUM_DETECT=1 ARCH:VERT_AMPS=1 +ACF:mode_UTR_RR=1 FITS:READOUTMODE=UpTheRampRollingReset [MODE_UTR_GR] ACF:FRAMEMODE=1 @@ -53,6 +62,7 @@ ACF:TAPLINE3="" ACF:TAPLINE4="" ACF:TAPLINES=3 ACF:RAWENABLE=0 +ACF:mode_UTR_GR=1 ARCH:HORI_AMPS=3 ARCH:NUM_DETECT=1 ARCH:VERT_AMPS=1 @@ -68,6 +78,7 @@ ACF:TAPLINE3="" ACF:TAPLINE4="" ACF:TAPLINES=3 ACF:RAWENABLE=0 +ACF:mode_RX=1 ARCH:HORI_AMPS=3 ARCH:NUM_DETECT=1 ARCH:VERT_AMPS=1 @@ -83,7 +94,72 @@ ACF:TAPLINE3="" ACF:TAPLINE4="" ACF:TAPLINES=3 ACF:RAWENABLE=0 +ACF:mode_RXR=1 ARCH:HORI_AMPS=3 ARCH:NUM_DETECT=1 ARCH:VERT_AMPS=1 +FITS:READOUTMODE=RXR +[MODE_FULLFRAME_UTR_RR] +ACF:FRAMEMODE=1 +ACF:PIXELCOUNT=512 +ACF:LINECOUNT=2048 +ACF:RAWENABLE=0 +ACF:TAPLINE0="AM54L,1,0" +ACF:TAPLINE1="AM25R,1,0" +ACF:TAPLINE2="AM29L,1,0" +ACF:TAPLINE3="AM31R,1,0" +ACF:TAPLINE4="AM52L,1,0" +ACF:TAPLINES=5 +ACF:mode_UTR_RR=1 +ARCH:HORI_AMPS=5 +ARCH:NUM_DETECT=1 +ARCH:VERT_AMPS=1 +FITS:READOUTMODE=UpTheRampRollingReset +[MODE_FULLFRAME_UTR_GR] +ACF:FRAMEMODE=1 +ACF:PIXELCOUNT=512 +ACF:LINECOUNT=2048 +ACF:RAWENABLE=0 +ACF:TAPLINE0="AM54L,1,0" +ACF:TAPLINE1="AM25R,1,0" +ACF:TAPLINE2="AM29L,1,0" +ACF:TAPLINE3="AM31R,1,0" +ACF:TAPLINE4="AM52L,1,0" +ACF:TAPLINES=5 +ACF:mode_UTR_GR=1 +ARCH:HORI_AMPS=5 +ARCH:NUM_DETECT=1 +ARCH:VERT_AMPS=1 +FITS:READOUTMODE=UpTheRampRollingReset +[MODE_FULLFRAME_RX] +ACF:FRAMEMODE=1 +ACF:PIXELCOUNT=512 +ACF:LINECOUNT=2048 +ACF:RAWENABLE=0 +ACF:TAPLINE0="AM54L,1,0" +ACF:TAPLINE1="AM25R,1,0" +ACF:TAPLINE2="AM29L,1,0" +ACF:TAPLINE3="AM31R,1,0" +ACF:TAPLINE4="AM52L,1,0" +ACF:TAPLINES=5 +ACF:mode_RX=1 +ARCH:HORI_AMPS=5 +ARCH:NUM_DETECT=1 +ARCH:VERT_AMPS=1 +FITS:READOUTMODE=RX +[MODE_FULLFRAME_RXR] +ACF:FRAMEMODE=1 +ACF:PIXELCOUNT=1024 +ACF:LINECOUNT=2048 +ACF:RAWENABLE=0 +ACF:TAPLINE0="AM54L,1,0" +ACF:TAPLINE1="AM25R,1,0" +ACF:TAPLINE2="AM29L,1,0" +ACF:TAPLINE3="AM31R,1,0" +ACF:TAPLINE4="AM52L,1,0" +ACF:TAPLINES=5 +ACF:mode_RXR=1 +ARCH:HORI_AMPS=5 +ARCH:NUM_DETECT=1 +ARCH:VERT_AMPS=1 FITS:READOUTMODE=RXR \ No newline at end of file diff --git a/src/hispecatc/hispecatc.seq b/src/hispecatc/hispecatc.seq index e0bd17b..3ef5c2a 100755 --- a/src/hispecatc/hispecatc.seq +++ b/src/hispecatc/hispecatc.seq @@ -21,7 +21,7 @@ param Abort=0 param freerun=0 param mode_FreerunRX=0 param mode_FreerunRXR=0 -param mode_UTR_RR=1 +param mode_UTR_RR=0 param mode_UTR_GR=0 param mode_EnhancedRollingReset=0 param mode_RX=0 @@ -83,7 +83,7 @@ if mode_RXR RXR_Sequence(); if mode_PermanentReset PGR_Sequence(); if mode_EnhancedRollingReset EnhancedRR_Sequence(); if exp_PulseWhileGlobReset Persistence_PulseGlobalReset(); -/* if mode_Guiding Guiding_Sequence(); */ +if mode_Guiding Guiding_Sequence(); GOTO WaitForExpose(); } @@ -150,7 +150,7 @@ StartRow(); wReadEN(); if prv_flag_reset ResetPulse(); if !prv_flag_reset ResetPulse_Dummy(); -ReadPixel_Blank(2); /*Needs two extra pixels because of the internl delay.*/ +ReadPixel_Blank(2); /*Needs two extra pixels because of the internal delay.*/ ReadPixel(H2RG_columns); wbHclk(); wbReadEN(); @@ -159,6 +159,7 @@ return; SEQUENCE RR_SkipRow { StartRow(); +wDelay10us(); if prv_flag_reset ResetPulse(); /* In RR, we pulse rows we don;t read to avoid build up that could overflow */ return; } diff --git a/src/hispecatc/hispecatc.waveform b/src/hispecatc/hispecatc.waveform index 5488b79..ccf2160 100644 --- a/src/hispecatc/hispecatc.waveform +++ b/src/hispecatc/hispecatc.waveform @@ -46,7 +46,7 @@ #define 10ms #eval 10 ms #define 10us #eval 10 us /* Timing specific to HxRG waveform */ -#define Tpix #eval 10 us /*2.85 us */ +#define Tpix #eval 7 us /*2.85 us */ #define Tpulse #eval 0.8 us /**/ #define T1Reset #eval 10 us /* chapter 6.2 says 10us or less is ok but it should be /2048 this value*/ /* Logical state defines */