From: <ro...@us...> - 2010-05-27 09:53:41
|
Revision: 1690 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1690&view=rev Author: ron-fox Date: 2010-05-27 09:53:34 +0000 (Thu, 27 May 2010) Log Message: ----------- Correct errors in v977 setup..had parameter def backwards. Modified Paths: -------------- trunk/VMUSBSpecTcl/spectclSetup.tcl Modified: trunk/VMUSBSpecTcl/spectclSetup.tcl =================================================================== --- trunk/VMUSBSpecTcl/spectclSetup.tcl 2010-05-20 10:12:36 UTC (rev 1689) +++ trunk/VMUSBSpecTcl/spectclSetup.tcl 2010-05-27 09:53:34 UTC (rev 1690) @@ -174,12 +174,15 @@ set channels $::adcChannels($module) set parameterName [lindex $channels 0] - parameter $param $parameterName + puts "Setting parameter $param -> $parameterName" + parameter $parameterName $param incr param # and it's mapping. + echo "Param map $module $::readoutDeviceType($module) 0 $channels" paramMap $module $::readoutDeviceType($module) 0 $channels + echo "Parammap done" # and the spectrum , a 16 bit bitmask spectrum. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-01-25 15:10:15
|
Revision: 1974 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1974&view=rev Author: ron-fox Date: 2012-01-25 15:10:05 +0000 (Wed, 25 Jan 2012) Log Message: ----------- Re-integrate CAEN dual range module support Modified Paths: -------------- trunk/VMUSBSpecTcl/spectclSetup.tcl Modified: trunk/VMUSBSpecTcl/spectclSetup.tcl =================================================================== --- trunk/VMUSBSpecTcl/spectclSetup.tcl 2012-01-24 12:56:35 UTC (rev 1973) +++ trunk/VMUSBSpecTcl/spectclSetup.tcl 2012-01-25 15:10:05 UTC (rev 1974) @@ -276,6 +276,39 @@ return $param } #---------------------------------------------------------------------------- +# +# Build channels and maps for a CAEN Dual range module. +# the adc parameters give the base names for parameters .h and .l for +# high and low ranges respectively. +# Parameters: +# param - First parameter number to use. +# name - Name of the module. +# Returns: +# next unused parameter number. +# +proc buildCAENDualMap {param name} { + set vsn $::adcConfiguration($name) + set resolution $::channelCount($::typeCAEN) + set channels $::adcChannels($name) + + set parameterList [list] + + foreach parameter $channels { + parameter $parameter.h $param + makeSpectrum $parameter.h $resolution + lappend parameterList $parameter.h + incr param + + parameter $parameter.l $param + makeSpectrum $parameter.l $resolution + lappend parameterList $parameter.l + incr param + } + paramMap $name $::typeCAEN $vsn $parameterList + + return $param +} +#---------------------------------------------------------------------------- # Build the channel maps, spectcl parameters and raw spectra from # the adcConfigurtion, readoutDeviceType and adcChannels information. # This will all be driven by the adcCahnnels array. @@ -303,6 +336,8 @@ } elseif {$::readoutDeviceType($module) eq $::typeV1729} { puts "CAEN V1729 FADC" set param [buildV1729Map $param $module] + } elseif {$::readoutDeviceType($module) eq $::typeCAENDual} { + set param [buildCAENDualMap $param $module] } else { set vsn $::adcConfiguration($module) set type $::readoutDeviceType($module) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |