The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit 0444a797 authored by Miguel Angel Gonzalez's avatar Miguel Angel Gonzalez
Browse files

Addition to be able to read main panel of new D11 detector

parent ab074c58
......@@ -9,10 +9,10 @@ if n_elements(detres) ne 2 then detres=[0,0] ; used when detector may have many
case flagg of
; 0 1 2 3 4 5 6 7 8 9 10
'List1': return,['D11','D22','BRISP','MILAND','D16<09','D11<07','D11<98','D22<07','D33','D11<02','PAXY','D11_256'] ;List name of supported instruments
'List2': return,['D11','D22','BRISP','D16' ,'D16' ,'D11' ,'D11' ,'D22' ,'D33','D11' ,'PAXY','D11' ] ;Real name of instruments
'LstOn': return,[ 1 , 1 , 1 , 1 , 1 , 1 , 0 , 1 , 1 , 0 ,1 ,0] ;Active instruments
'LstSR': return,[ 1 , 1 , 1 , 2 , 2 , 1 , 1 , 1 , 1 , 1 ,1 ,1] ;0=reflectometry 1=sans 2=scan
'List1': return,['D11','D22','BRISP','MILAND','D16<09','D11<07','D11<98','D22<07','D33','D11<02','PAXY','D11_256', 'D11>2021'] ;List name of supported instruments
'List2': return,['D11','D22','BRISP','D16' ,'D16' ,'D11' ,'D11' ,'D22' ,'D33','D11' ,'PAXY','D11', 'D11' ] ;Real name of instruments
'LstOn': return,[ 1 , 1 , 1 , 1 , 1 , 1 , 0 , 1 , 1 , 0 ,1 ,0, 1] ;Active instruments
'LstSR': return,[ 1 , 1 , 1 , 2 , 2 , 1 , 1 , 1 , 1 , 1 ,1 ,1, 1] ;0=reflectometry 1=sans 2=scan
'Inits': begin ;Default parameters index set in rdid or read_hdf
;0 1 2 3 4 5 6 7 8
......@@ -43,7 +43,7 @@ case flagg of
FCT =[1.,1.] ;128./[nX,nY] image detector
case index of
0: begin ;** D11 ** from 2007
0: begin ;** D11 ** from 2007 to 2020
collima= '1.5,2.5,4.0,5.5,8.0,10.5,13.5,16.5,20.5,28.,34.,40.5'
att2017 = '1., 324., 1052., 2813.' ;attenuators used until 2017
att2018 = ', 8.53, 30.65, 69.29, 256.28, 603.85, 1990.0, 14889.27' ;new attenuators installed on 2018
......@@ -197,6 +197,40 @@ case flagg of
ofa =0 & bfit=0 & disQdep=1
rdset, /RAW
end
12: begin ;** D11 ** from 2021 onwards (only main panel)
collima= '1.5,2.5,4.0,5.5,8.0,10.5,13.5,16.5,20.5,28.,34.,40.5'
att2017 = '1., 324., 1052., 2813.' ;attenuators used until 2017
att2018 = ', 8.53, 30.65, 69.29, 256.28, 603.85, 1990.0, 14889.27' ;new attenuators installed on 2018
;att2019 = ', 8.53, 30.65, 68.47, 256.28, 603.85, 1623.87, 14889.27' ;new attenuators installed on 2018
; Attenuation coefficients changed again in 2019,
; so instead of modifying read_hdf and adding a new attenuator table,
; I use a mechanism equivalent to the one used in D22 to read the
; second attenuator (chopper) --> paridx[18]
; This number is then used to read the attenuation coefficient
; in sans_supl[71] and will be used later in sans_settings_phi0.
; There I define 2 possibilities:
; 1. If the attenuator number > 3 and sans_supl[71] > 1 then I
; use directly this number as attenuation coefficient.
; 2. Otherwise, use the old method, reading the value from the
; table as attenu[sans_supl[24]]
attenua = att2017 + att2018
paridx[18] = 29 ;parameter number corresponding to attenuation coefficient (set in read_hdf)
; attenuF = correction to attenuation due to collimation dependence, tested in 2017, not needed with 2018 atts
; attenuF=[[1. , 1. , 1. , 1. , 1., 1. , 1. , 1. , 1. , 1. , 1. , 1. ],$ ;No attenuator
; [.9505, .969, 1.052, 1.017, 1., .967, .805, .856, .862, .735, .686, 1.134],$ ;Attenuator1 factor/collimation
; [.9505, .969, 1.052, 1.017, 1., .967, .805, .856, .862, .735, .686, 1.134],$ ;Attenuator2 factor/collimation (temp)
; [.9505, .969, 1.052, 1.017, 1., .967, .805, .856, .862, .735, .686, 1.134]] ;Attenuator3 factor/collimation (temp)
Qdep = ''
XWdep= ''
fct =[0.5, 0.666] & centex='127.50' & centey='95.50' & FX =-1
beamf =1 & Xdet=0.4 & Ydet=0.8 & tau=.42e-6 & ftau= 4 ; tau=.42e-6 -> Jun 2014
ofa =0 & bfit=0 & disQdep=1
rdset, /RAW
end
else: return, 'NeverHappen'
endcase
......@@ -213,7 +247,7 @@ case flagg of
;mask starts on pixel (x1,y1) and extends nx pixels horizontally and
;ny pixels vertically.
'Mask': begin & case index of
0: begin ;** D11 **
0: begin ;** D11 2007-2020**
sans_masq =[[1L,1,128,128], [1,1 ,128,1],[1,2 ,128,1],[1,128 ,128,1]]
sans_masq =[[sans_masq],[1,1,1,128],[128,1,1,128],[2,3,1,1],[127,3,1,1],[2,126,2,2],[126,126,2,2]]
......@@ -274,6 +308,9 @@ case flagg of
sans_masq =[[1L,1,256,256], [1,1 ,256,2],[1,3 ,256,2],[1,255 ,256,2]]
sans_masq =[[sans_masq],[1,1,2,256],[255,1,2,256],[3,5,2,2],[253,5,2,2],[3,251,4,4],[251,251,4,4]]
end
12: begin ;** D11 2021**
sans_masq =[[1L,1,256,192], [1,1,256,2], [1,1,4,192], [1,191,256,2], [253,1,4,192]]
end
else: sans_masq =[[1L,1,128,128]] ;** UNKNOWN **
endcase
return, sans_masq
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment