Menu
▾
▴
[Nsclspectcl-cvscommits] SpecTcl/contrib/treeparam ParameterManipulator.tcl,5.1,5.2 SpecTclGui.tcl,5.1,5.2 SpectrumGenerator.tcl,5.1,5.2 TreeParameter.h,5.1,5.2 VariableManipulator.tcl,5.1,5.2 Makefile,5.1,NONE ParameterGenerator.tcl,5.1,NONE SpecTclRC.tcl,5.1,NONE TopGui.tcl,5.1,NONE server.tcl,5.1,NONE
|
From: Daniel B. <ba...@us...> - 2004-12-20 22:13:47
|
Update of /cvsroot/nsclspectcl/SpecTcl/contrib/treeparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7781 Modified Files: ParameterManipulator.tcl SpecTclGui.tcl SpectrumGenerator.tcl TreeParameter.h VariableManipulator.tcl Removed Files: Makefile ParameterGenerator.tcl SpecTclRC.tcl TopGui.tcl server.tcl Log Message: Synchronizing the TreeParameter package between SpecTcl versions Committing in . Modified Files: GateGenerator.tcl ParameterManipulator.tcl SpecTclGui.tcl SpectrumGenerator.tcl TreeParameter.h TreeParameter.tcl TreeVariable.h TreeVariable.tcl VariableManipulator.tcl install.htm mclistbox.tcl notebook.tcl tabnbook.tcl Removed Files: Makefile ParameterGenerator.tcl SpecTclRC.tcl TopGui.tcl server.tcl --- server.tcl DELETED --- --- ParameterGenerator.tcl DELETED --- Index: SpecTclGui.tcl =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/treeparam/SpecTclGui.tcl,v retrieving revision 5.1 retrieving revision 5.2 diff -C2 -d -r5.1 -r5.2 *** SpecTclGui.tcl 29 Nov 2004 16:56:42 -0000 5.1 --- SpecTclGui.tcl 20 Dec 2004 22:13:28 -0000 5.2 *************** *** 30,34 **** proc CheckFiles {} { ! global SpecTclHome set fileList "\ mclistbox.tcl \ --- 30,34 ---- proc CheckFiles {} { ! global TreeParameterHome set fileList "\ mclistbox.tcl \ *************** *** 43,49 **** " foreach f $fileList { ! if {[file exists $SpecTclHome/contrib/treeparam/$f] == 0} { tk_messageBox -message "Incorrect TreeParameter installation. \ ! File $f is missing in directory $SpecTclHome/contrib/treeparam" exit } --- 43,49 ---- " foreach f $fileList { ! if {[file exists $TreeParameterHome/$f] == 0} { tk_messageBox -message "Incorrect TreeParameter installation. \ ! File $f is missing in directory $TreeParameterHome" exit } *************** *** 51,70 **** } ! source $SpecTclHome/contrib/treeparam/mclistbox.tcl ! source $SpecTclHome/contrib/treeparam/notebook.tcl ! source $SpecTclHome/contrib/treeparam/tabnbook.tcl ! source $SpecTclHome/contrib/treeparam/TreeParameter.tcl ! source $SpecTclHome/contrib/treeparam/SpectrumGenerator.tcl ! source $SpecTclHome/contrib/treeparam/ParameterManipulator.tcl ! source $SpecTclHome/contrib/treeparam/TreeVariable.tcl ! source $SpecTclHome/contrib/treeparam/VariableManipulator.tcl ! source $SpecTclHome/contrib/treeparam/GateGenerator.tcl CheckVersion --- 51,73 ---- } + if {![info exist TreeParameterHome]} { + set TreeParameterHome $SpecTclHome/contrib/treeparam + } ! source $TreeParameterHome/mclistbox.tcl ! source $TreeParameterHome/notebook.tcl ! source $TreeParameterHome/tabnbook.tcl ! source $TreeParameterHome/TreeParameter.tcl ! source $TreeParameterHome/SpectrumGenerator.tcl ! source $TreeParameterHome/ParameterManipulator.tcl ! source $TreeParameterHome/TreeVariable.tcl ! source $TreeParameterHome/VariableManipulator.tcl ! source $TreeParameterHome/GateGenerator.tcl CheckVersion Index: VariableManipulator.tcl =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/treeparam/VariableManipulator.tcl,v retrieving revision 5.1 retrieving revision 5.2 diff -C2 -d -r5.1 -r5.2 *** VariableManipulator.tcl 29 Nov 2004 16:56:43 -0000 5.1 --- VariableManipulator.tcl 20 Dec 2004 22:13:28 -0000 5.2 *************** *** 19,29 **** set mod $topv.modify set modcolor lightgreen frame $mod -borderwidth 2 -relief groove -background $modcolor label $mod.labelname -text Name -background $modcolor label $mod.labelvalue -text Value -background $modcolor label $mod.labelunit -text Unit -background $modcolor checkbutton $mod.array -text "Array" -variable variable(Array) -background $modcolor ! grid x $mod.labelname $mod.labelvalue $mod.labelunit x $mod.array -sticky news for {set i 1} {$i <= 20} {incr i} { --- 19,32 ---- set mod $topv.modify set modcolor lightgreen + set variable(select) 1 frame $mod -borderwidth 2 -relief groove -background $modcolor + menubutton $mod.variable -width 5 -text Variable -bg $modcolor + GenerateTreeVariableMenu $mod.variable SetSelectedVariable label $mod.labelname -text Name -background $modcolor label $mod.labelvalue -text Value -background $modcolor label $mod.labelunit -text Unit -background $modcolor checkbutton $mod.array -text "Array" -variable variable(Array) -background $modcolor ! grid $mod.variable $mod.labelname $mod.labelvalue $mod.labelunit x $mod.array -sticky news for {set i 1} {$i <= 20} {incr i} { *************** *** 50,53 **** --- 53,62 ---- } + proc SetSelectedVariable {name} { + global variable + set id $variable(select) + set variable(Name$id) $name + } + proc VariableManipulator {id} { global topv variable *************** *** 55,61 **** set modcolor lightgreen ! menubutton $mod.variable$id -width 8 -text Variable -background $modcolor # GenerateTreeVariableMenu $mod.variable$id "MenuLoadVariable $id" ! GenerateTreeVariableMenu $mod.variable$id "set variable(Name$id)" entry $mod.labelvariable$id -width 25 -textvariable variable(Name$id) -background $modcolor entry $mod.value$id -width 8 -textvariable variable(Value$id) -background $modcolor --- 64,71 ---- set modcolor lightgreen ! # menubutton $mod.variable$id -width 8 -text Variable -background $modcolor # GenerateTreeVariableMenu $mod.variable$id "MenuLoadVariable $id" ! # GenerateTreeVariableMenu $mod.variable$id "set variable(Name$id)" ! radiobutton $mod.select$id -text "" -variable variable(select) -value $id -width 5 -bg $modcolor entry $mod.labelvariable$id -width 25 -textvariable variable(Name$id) -background $modcolor entry $mod.value$id -width 8 -textvariable variable(Value$id) -background $modcolor *************** *** 63,67 **** button $mod.load$id -width 4 -text Load -command "LoadVariable $id" -background $modcolor button $mod.set$id -width 4 -text Set -command "SetVariable $id" -background $modcolor ! grid $mod.variable$id $mod.labelvariable$id $mod.value$id $mod.unit$id $mod.load$id $mod.set$id -sticky news } --- 73,77 ---- button $mod.load$id -width 4 -text Load -command "LoadVariable $id" -background $modcolor button $mod.set$id -width 4 -text Set -command "SetVariable $id" -background $modcolor ! grid $mod.select$id $mod.labelvariable$id $mod.value$id $mod.unit$id $mod.load$id $mod.set$id -sticky news } Index: ParameterManipulator.tcl =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/treeparam/ParameterManipulator.tcl,v retrieving revision 5.1 retrieving revision 5.2 diff -C2 -d -r5.1 -r5.2 *** ParameterManipulator.tcl 29 Nov 2004 16:56:42 -0000 5.1 --- ParameterManipulator.tcl 20 Dec 2004 22:13:28 -0000 5.2 *************** *** 18,24 **** --- 18,27 ---- set modcolor lightblue + set parameter(select) 1 set mod $topp.modify frame $mod -borderwidth 2 -relief groove -background $modcolor + menubutton $mod.parameter -width 8 -text Parameter -background $modcolor + GenerateTreeMenu $mod.parameter SetSelectedParameter label $mod.labelname -text Name -background $modcolor label $mod.labelstart -text Low -background $modcolor *************** *** 27,31 **** label $mod.labelunit -text Unit -background $modcolor checkbutton $mod.array -text "Array" -variable parameter(Array) -background $modcolor ! grid x $mod.labelname $mod.labelstart $mod.labelstop $mod.labelunit x $mod.array - -sticky news for {set i 1} {$i <= 20} {incr i} { --- 30,34 ---- label $mod.labelunit -text Unit -background $modcolor checkbutton $mod.array -text "Array" -variable parameter(Array) -background $modcolor ! grid $mod.parameter $mod.labelname $mod.labelstart $mod.labelstop $mod.labelunit x $mod.array - -sticky news for {set i 1} {$i <= 20} {incr i} { *************** *** 39,42 **** --- 42,51 ---- } + proc SetSelectedParameter {name} { + global parameter + set id $parameter(select) + set parameter(Name$id) $name + } + proc InsertParameterManipulator {id} { global topp parameter *************** *** 44,50 **** set mod $topp.modify ! menubutton $mod.parameter$id -width 8 -text Parameter -background $modcolor # GenerateTreeMenu $mod.parameter$id "MenuLoadParameter $id" ! GenerateTreeMenu $mod.parameter$id "set parameter(Name$id)" entry $mod.labelparameter$id -textvariable parameter(Name$id) -background $modcolor entry $mod.start$id -width 8 -textvariable parameter(Start$id) -background $modcolor --- 53,60 ---- set mod $topp.modify ! # menubutton $mod.parameter$id -width 8 -text Parameter -background $modcolor # GenerateTreeMenu $mod.parameter$id "MenuLoadParameter $id" ! # GenerateTreeMenu $mod.parameter$id "set parameter(Name$id)" ! radiobutton $mod.select$id -width 8 -text "" -variable parameter(select) -value $id -bg $modcolor entry $mod.labelparameter$id -textvariable parameter(Name$id) -background $modcolor entry $mod.start$id -width 8 -textvariable parameter(Start$id) -background $modcolor *************** *** 55,59 **** button $mod.load$id -text Load -command "LoadParameter $id" -background $modcolor button $mod.change$id -text "Change Spectra" -background lightgreen -command "ChangeSpectra $id" -width 10 ! grid $mod.parameter$id $mod.labelparameter$id $mod.start$id $mod.stop$id $mod.unit$id \ $mod.load$id $mod.set$id $mod.change$id -sticky news --- 65,69 ---- button $mod.load$id -text Load -command "LoadParameter $id" -background $modcolor button $mod.change$id -text "Change Spectra" -background lightgreen -command "ChangeSpectra $id" -width 10 ! grid $mod.select$id $mod.labelparameter$id $mod.start$id $mod.stop$id $mod.unit$id \ $mod.load$id $mod.set$id $mod.change$id -sticky news --- TopGui.tcl DELETED --- Index: TreeParameter.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/treeparam/TreeParameter.h,v retrieving revision 5.1 retrieving revision 5.2 diff -C2 -d -r5.1 -r5.2 *** TreeParameter.h 29 Nov 2004 16:56:43 -0000 5.1 --- TreeParameter.h 20 Dec 2004 22:13:28 -0000 5.2 *************** *** 52,56 **** string name; double value; ! bool valid, haschanged; UInt_t id, bins; double start, stop, inc; --- 52,56 ---- string name; double value; ! bool haschanged; UInt_t id, bins; double start, stop, inc; *************** *** 67,71 **** // Constructor with only name specification (version 1.2) CTreeParameter(string parameterName) : name(parameterName) { ! valid = true; haschanged = false; start = 1; --- 67,71 ---- // Constructor with only name specification (version 1.2) CTreeParameter(string parameterName) : name(parameterName) { ! // valid = true; haschanged = false; start = 1; *************** *** 82,86 **** CTreeParameter(string parameterName, string parameterUnit) : name(parameterName), unit(parameterUnit) { ! valid = true; haschanged = false; start = 1; --- 82,86 ---- CTreeParameter(string parameterName, string parameterUnit) : name(parameterName), unit(parameterUnit) { ! // valid = true; haschanged = false; start = 1; *************** *** 97,101 **** string parameterUnit) : name(parameterName), start(parameterStart), stop(parameterStop), unit(parameterUnit) { ! valid = true; haschanged = false; bins = 100; --- 97,101 ---- string parameterUnit) : name(parameterName), start(parameterStart), stop(parameterStop), unit(parameterUnit) { ! // valid = true; haschanged = false; bins = 100; *************** *** 111,115 **** name(parameterName), bins(parameterBins), start(parameterStart), stop(parameterStop), unit(parameterUnit) { ! valid = true; haschanged = false; inc = (stop - start) / (double)bins; --- 111,115 ---- name(parameterName), bins(parameterBins), start(parameterStart), stop(parameterStop), unit(parameterUnit) { ! // valid = true; haschanged = false; inc = (stop - start) / (double)bins; *************** *** 122,126 **** CTreeParameter(string parameterName, UInt_t parameterBits) : name(parameterName) { ! valid = true; haschanged = false; start = 0; --- 122,126 ---- CTreeParameter(string parameterName, UInt_t parameterBits) : name(parameterName) { ! // valid = true; haschanged = false; start = 0; *************** *** 138,142 **** double parameterOther, string parameterUnit, bool slopeOrStop) : name(parameterName), start(parameterStart), unit(parameterUnit) { ! valid = true; haschanged = false; bins = (UInt_t) pow(2, parameterBits); --- 138,142 ---- double parameterOther, string parameterUnit, bool slopeOrStop) : name(parameterName), start(parameterStart), unit(parameterUnit) { ! // valid = true; haschanged = false; bins = (UInt_t) pow(2, parameterBits); *************** *** 159,163 **** CTreeParameter(const CTreeParameter& aCTreeParameter) { name = aCTreeParameter.name; ! valid = aCTreeParameter.valid; value = aCTreeParameter.value; haschanged = aCTreeParameter.haschanged; --- 159,163 ---- CTreeParameter(const CTreeParameter& aCTreeParameter) { name = aCTreeParameter.name; ! // valid = aCTreeParameter.valid; value = aCTreeParameter.value; haschanged = aCTreeParameter.haschanged; *************** *** 173,178 **** // Operator double() to cast our parameters to doubles in expressions operator double() { ! return value; ! // return (double)(start + inc * (*pEvent)[id]); } --- 173,178 ---- // Operator double() to cast our parameters to doubles in expressions operator double() { ! if (isValid()) return value; ! else return sqrt(-1); } *************** *** 185,197 **** // Version 1.2: this operation is no longer necessary since parameters are now real valued double operator=(const double& rhs) { ! // UInt_t data; value = rhs; - // data = (UInt_t)((rhs - start) / inc); - // if (data < 0) data = 0; - // if (data > max) data = max; (*pEvent)[id] = value; return (double)rhs; } // Operator+= double operator+=(const double& rhs) { --- 185,211 ---- // Version 1.2: this operation is no longer necessary since parameters are now real valued double operator=(const double& rhs) { ! if (isnan(rhs)) { ! Reset(); ! return (double)rhs; ! } value = rhs; (*pEvent)[id] = value; return (double)rhs; } + // Operator = assignment operator to another CTreeParameter + // This operator is used when equaling two TreeParameters such as in + // tree.branch.leaf1 = tree.branch.leaf2; or + // tree.branch.leaf1 = tree.branch.leaf2 = mydouble ; + CTreeParameter operator=(CTreeParameter& aCTreeParameter) { + if (!aCTreeParameter.isValid()) { + Reset(); + } else { + value = aCTreeParameter.value; + (*pEvent)[id] = value; + } + return (CTreeParameter)aCTreeParameter; + } + // Operator+= double operator+=(const double& rhs) { *************** *** 268,275 **** string getUnit() {return unit;} void setUnit(char* theUnit) {unit = theUnit;} ! bool isValid() {return valid;} ! void setValid() {valid = true;} ! void setInvalid() {valid = false; (*pEvent)[id].clear();} ! void Reset() {(*pEvent)[id].clear();} bool hasChanged() {return haschanged;} void setChanged() {haschanged = true;} --- 282,289 ---- string getUnit() {return unit;} void setUnit(char* theUnit) {unit = theUnit;} ! bool isValid() {return (*pEvent)[id].isValid();} ! // void setValid() {(*pEvent)[id].setValid(true);} ! void setInvalid() {(*pEvent)[id].clear();} ! void Reset() {value = 0.0; (*pEvent)[id].clear();} bool hasChanged() {return haschanged;} void setChanged() {haschanged = true;} *************** *** 326,330 **** { name = parameterName; ! valid = true; haschanged = false; start = 0; --- 340,344 ---- { name = parameterName; ! // valid = true; haschanged = false; start = 0; *************** *** 343,347 **** start = parameterStart; unit = parameterUnit; ! valid = true; haschanged = false; bins = (UInt_t) pow(2, parameterBits); --- 357,361 ---- start = parameterStart; unit = parameterUnit; ! // valid = true; haschanged = false; bins = (UInt_t) pow(2, parameterBits); *************** *** 361,365 **** { name = parameterName; ! valid = true; haschanged = false; start = 1; --- 375,379 ---- { name = parameterName; ! // valid = true; haschanged = false; start = 1; *************** *** 376,380 **** name = parameterName; unit = parameterUnit; ! valid = true; haschanged = false; start = 1; --- 390,394 ---- name = parameterName; unit = parameterUnit; ! // valid = true; haschanged = false; start = 1; *************** *** 392,396 **** stop = parameterStop; unit = parameterUnit; ! valid = true; haschanged = false; bins = 100; --- 406,410 ---- stop = parameterStop; unit = parameterUnit; ! // valid = true; haschanged = false; bins = 100; *************** *** 408,412 **** stop = parameterStop; unit = parameterUnit; ! valid = true; haschanged = false; inc = (stop - start) / (double)bins; --- 422,426 ---- stop = parameterStop; unit = parameterUnit; ! // valid = true; haschanged = false; inc = (stop - start) / (double)bins; --- Makefile DELETED --- Index: SpectrumGenerator.tcl =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/treeparam/SpectrumGenerator.tcl,v retrieving revision 5.1 retrieving revision 5.2 diff -C2 -d -r5.1 -r5.2 *** SpectrumGenerator.tcl 29 Nov 2004 16:56:43 -0000 5.1 --- SpectrumGenerator.tcl 20 Dec 2004 22:13:28 -0000 5.2 *************** *** 53,60 **** radiobutton $type.n.1g -text "Gamma1D" -variable spectrumType -value g1 -command SpectrumType1G -background $optionscolor radiobutton $type.n.2g -text "Gamma2D" -variable spectrumType -value g2 -command SpectrumType2G -background $optionscolor ! radiobutton $type.n.gp -text "GammaP" -variable spectrumType -value gp -command SpectrumTypeGP -background $optionscolor ! grid $type.n.1d $type.n.bit $type.n.gp -sticky w ! grid $type.n.2d $type.n.1g x -sticky w ! grid $type.n.sum $type.n.2g x -sticky w pack $type.label $type.n pack $type -expand 1 -fill both -side left --- 53,60 ---- radiobutton $type.n.1g -text "Gamma1D" -variable spectrumType -value g1 -command SpectrumType1G -background $optionscolor radiobutton $type.n.2g -text "Gamma2D" -variable spectrumType -value g2 -command SpectrumType2G -background $optionscolor ! # radiobutton $type.n.gp -text "GammaP" -variable spectrumType -value gp -command SpectrumTypeGP -background $optionscolor ! grid $type.n.1d $type.n.bit -sticky w ! grid $type.n.2d $type.n.1g -sticky w ! grid $type.n.sum $type.n.2g -sticky w pack $type.label $type.n pack $type -expand 1 -fill both -side left *************** *** 568,573 **** --- 568,577 ---- # if {[string match [tk_messageBox -icon warning -message "The spectrum $Name already exists. Do you want to overwrite it?" \ -title Warning -type yesno -parent .gui] yes]} { + set gate [lindex [lindex [lindex [apply -list $Name] 0] 1] 0] spectrum -delete $Name spectrum $Name $spectrumType $ParameterList $ResolutionList $spectrumDatatype + if {![string equal $gate -TRUE-]} { + apply $gate $Name + } puts "Spectrum $Name replaced" # } *************** *** 1142,1146 **** set treevariableList $changedTreeList ! set gateList [SortGates [gate -list]] set applyList [apply -list] --- 1146,1156 ---- set treevariableList $changedTreeList ! # 12/16/04: Do not write deleted gates to file ! set rawList [gate -list] ! foreach g $rawList { ! set t [lindex $g 2] ! if {![string equal $t F] && ![string equal $t T]} {lappend gateList $g} ! } ! set gateList [SortGates $gateList] set applyList [apply -list] *************** *** 1197,1201 **** set gatename [lindex $gate 0] set gatetype [lindex $gate 2] ! if {[string compare $gatetype T] != 0} { puts $handle "apply $gatename $spectrum" } --- 1207,1211 ---- set gatename [lindex $gate 0] set gatetype [lindex $gate 2] ! if {![string equal $gatetype T] && ![string equal $gatetype F]} { puts $handle "apply $gatename $spectrum" } --- SpecTclRC.tcl DELETED --- |