diff --git a/geant4/PQt_musrSim/QmuSRSim.pl b/geant4/PQt_musrSim/QmuSRSim.pl index 913e942..97d8d8d 100644 --- a/geant4/PQt_musrSim/QmuSRSim.pl +++ b/geant4/PQt_musrSim/QmuSRSim.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'QmuSRSim.ui' # -# Created: Wed May 2 16:04:06 2012 +# Created: Tue May 8 17:34:28 2012 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -46,9 +46,6 @@ use Qt::attributes qw( textLabel2_3_2_2_2 ENERGY textLabel2_3_2_2_2_2 - textLabel2_2_3 - BFIELD - textLabel2_2_2_2_3_2_3 textLabel2_2_2 TL textLabel2_2_2_2_3_2_2_2_2 @@ -76,6 +73,12 @@ use Qt::attributes qw( SR_B textLabel2_2_2_2_2_3 SR_E + textLabel2_2_3_2 + textLabel2_2_3 + SAMHV + BFIELD + textLabel2_2_2_2_3_2_3_2 + textLabel2_2_2_2_3_2_3 Old frame5_2 textLabel2_3_2_3_2 @@ -17946,196 +17949,220 @@ sub NEW $layout10->addWidget(textLabel2_3_2_2_2_2); my $LayoutWidget_2 = Qt::Widget(frame5, '$LayoutWidget_2'); - $LayoutWidget_2->setGeometry( Qt::Rect(604, 230, 130, 26) ); - my $layout13 = Qt::HBoxLayout($LayoutWidget_2, 0, 0, '$layout13'); + $LayoutWidget_2->setGeometry( Qt::Rect(453, 230, 90, 26) ); + my $layout14_2 = Qt::HBoxLayout($LayoutWidget_2, 0, 0, '$layout14_2'); - textLabel2_2_3 = Qt::Label($LayoutWidget_2, "textLabel2_2_3"); - textLabel2_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); - textLabel2_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); - textLabel2_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); - $layout13->addWidget(textLabel2_2_3); - - BFIELD = Qt::LineEdit($LayoutWidget_2, "BFIELD"); - $layout13->addWidget(BFIELD); - - textLabel2_2_2_2_3_2_3 = Qt::Label($LayoutWidget_2, "textLabel2_2_2_2_3_2_3"); - textLabel2_2_2_2_3_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); - textLabel2_2_2_2_3_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); - textLabel2_2_2_2_3_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); - $layout13->addWidget(textLabel2_2_2_2_3_2_3); - - my $LayoutWidget_3 = Qt::Widget(frame5, '$LayoutWidget_3'); - $LayoutWidget_3->setGeometry( Qt::Rect(453, 230, 90, 26) ); - my $layout14_2 = Qt::HBoxLayout($LayoutWidget_3, 0, 0, '$layout14_2'); - - textLabel2_2_2 = Qt::Label($LayoutWidget_3, "textLabel2_2_2"); + textLabel2_2_2 = Qt::Label($LayoutWidget_2, "textLabel2_2_2"); textLabel2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout14_2->addWidget(textLabel2_2_2); - TL = Qt::LineEdit($LayoutWidget_3, "TL"); + TL = Qt::LineEdit($LayoutWidget_2, "TL"); $layout14_2->addWidget(TL); - textLabel2_2_2_2_3_2_2_2_2 = Qt::Label($LayoutWidget_3, "textLabel2_2_2_2_3_2_2_2_2"); + textLabel2_2_2_2_3_2_2_2_2 = Qt::Label($LayoutWidget_2, "textLabel2_2_2_2_3_2_2_2_2"); textLabel2_2_2_2_3_2_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout14_2->addWidget(textLabel2_2_2_2_3_2_2_2_2); - my $LayoutWidget_4 = Qt::Widget(frame5, '$LayoutWidget_4'); - $LayoutWidget_4->setGeometry( Qt::Rect(313, 230, 110, 26) ); - my $layout15 = Qt::HBoxLayout($LayoutWidget_4, 0, 0, '$layout15'); + my $LayoutWidget_3 = Qt::Widget(frame5, '$LayoutWidget_3'); + $LayoutWidget_3->setGeometry( Qt::Rect(313, 230, 110, 26) ); + my $layout15 = Qt::HBoxLayout($LayoutWidget_3, 0, 0, '$layout15'); - textLabel2_3_2_2 = Qt::Label($LayoutWidget_4, "textLabel2_3_2_2"); + textLabel2_3_2_2 = Qt::Label($LayoutWidget_3, "textLabel2_3_2_2"); textLabel2_3_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_3_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_3_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout15->addWidget(textLabel2_3_2_2); - L3 = Qt::LineEdit($LayoutWidget_4, "L3"); + L3 = Qt::LineEdit($LayoutWidget_3, "L3"); $layout15->addWidget(L3); - textLabel2_2_2_2_3_2_2_2 = Qt::Label($LayoutWidget_4, "textLabel2_2_2_2_3_2_2_2"); + textLabel2_2_2_2_3_2_2_2 = Qt::Label($LayoutWidget_3, "textLabel2_2_2_2_3_2_2_2"); textLabel2_2_2_2_3_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout15->addWidget(textLabel2_2_2_2_3_2_2_2); - my $LayoutWidget_5 = Qt::Widget(frame5, '$LayoutWidget_5'); - $LayoutWidget_5->setGeometry( Qt::Rect(40, 100, 100, 26) ); - my $layout16 = Qt::HBoxLayout($LayoutWidget_5, 0, 0, '$layout16'); + my $LayoutWidget_4 = Qt::Widget(frame5, '$LayoutWidget_4'); + $LayoutWidget_4->setGeometry( Qt::Rect(40, 100, 100, 26) ); + my $layout16 = Qt::HBoxLayout($LayoutWidget_4, 0, 0, '$layout16'); - textLabel2 = Qt::Label($LayoutWidget_5, "textLabel2"); + textLabel2 = Qt::Label($LayoutWidget_4, "textLabel2"); textLabel2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout16->addWidget(textLabel2); - L1 = Qt::LineEdit($LayoutWidget_5, "L1"); + L1 = Qt::LineEdit($LayoutWidget_4, "L1"); $layout16->addWidget(L1); - textLabel2_2_2_2_3_2_2_3 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_3_2_2_3"); + textLabel2_2_2_2_3_2_2_3 = Qt::Label($LayoutWidget_4, "textLabel2_2_2_2_3_2_2_3"); textLabel2_2_2_2_3_2_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout16->addWidget(textLabel2_2_2_2_3_2_2_3); - my $LayoutWidget_6 = Qt::Widget(frame5, '$LayoutWidget_6'); - $LayoutWidget_6->setGeometry( Qt::Rect(640, 40, 110, 98) ); - my $layout33 = Qt::GridLayout($LayoutWidget_6, 1, 1, 0, 0, '$layout33'); + my $LayoutWidget_5 = Qt::Widget(frame5, '$LayoutWidget_5'); + $LayoutWidget_5->setGeometry( Qt::Rect(640, 40, 110, 98) ); + my $layout33 = Qt::GridLayout($LayoutWidget_5, 1, 1, 0, 0, '$layout33'); - textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_2"); + textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_2"); textLabel2_2_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_2, 1, 0); - RA_R = Qt::LineEdit($LayoutWidget_6, "RA_R"); + RA_R = Qt::LineEdit($LayoutWidget_5, "RA_R"); $layout33->addWidget(RA_R, 2, 1); - textLabel2_2_2_2_3_2_2_3_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3_2_2_3_2"); + textLabel2_2_2_2_3_2_2_3_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_3_2_2_3_2"); textLabel2_2_2_2_3_2_2_3_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_3_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_3_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_3_2_2_3_2, 0, 2); - textLabel2_2_2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_2_2"); + textLabel2_2_2_2_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_2_2"); textLabel2_2_2_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_2_2, 2, 0); - textLabel2_2_2_2_3_2_2_3_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3_2_2_3_2_2_2"); + textLabel2_2_2_2_3_2_2_3_2_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_3_2_2_3_2_2_2"); textLabel2_2_2_2_3_2_2_3_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_3_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_3_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_3_2_2_3_2_2_2, 2, 2); - RA_T = Qt::LineEdit($LayoutWidget_6, "RA_T"); + RA_T = Qt::LineEdit($LayoutWidget_5, "RA_T"); $layout33->addWidget(RA_T, 0, 1); - textLabel2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2"); + textLabel2_2_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2"); textLabel2_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2, 0, 0); - textLabel2_2_2_2_3_2_2_3_2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3_2_2_3_2_2_2_2"); + textLabel2_2_2_2_3_2_2_3_2_2_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_3_2_2_3_2_2_2_2"); textLabel2_2_2_2_3_2_2_3_2_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_3_2_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_3_2_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_3_2_2_3_2_2_2_2, 3, 2); - textLabel2_2_2_2_2_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_2_2_2"); + textLabel2_2_2_2_2_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_2_2_2"); textLabel2_2_2_2_2_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_2_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_2_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_2_2_2, 3, 0); - textLabel2_2_2_2_3_2_2_3_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3_2_2_3_2_2"); + textLabel2_2_2_2_3_2_2_3_2_2 = Qt::Label($LayoutWidget_5, "textLabel2_2_2_2_3_2_2_3_2_2"); textLabel2_2_2_2_3_2_2_3_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2_3_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2_3_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout33->addWidget(textLabel2_2_2_2_3_2_2_3_2_2, 1, 2); - RA_B = Qt::LineEdit($LayoutWidget_6, "RA_B"); + RA_B = Qt::LineEdit($LayoutWidget_5, "RA_B"); $layout33->addWidget(RA_B, 1, 1); - RA_L = Qt::LineEdit($LayoutWidget_6, "RA_L"); + RA_L = Qt::LineEdit($LayoutWidget_5, "RA_L"); $layout33->addWidget(RA_L, 3, 1); - my $LayoutWidget_7 = Qt::Widget(frame5, '$LayoutWidget_7'); - $LayoutWidget_7->setGeometry( Qt::Rect(160, 210, 140, 50) ); - my $layout11 = Qt::GridLayout($LayoutWidget_7, 1, 1, 0, 0, '$layout11'); + my $LayoutWidget_6 = Qt::Widget(frame5, '$LayoutWidget_6'); + $LayoutWidget_6->setGeometry( Qt::Rect(160, 210, 140, 50) ); + my $layout11 = Qt::GridLayout($LayoutWidget_6, 1, 1, 0, 0, '$layout11'); - textLabel2_2_2_2_3_2_2 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2_3_2_2"); + textLabel2_2_2_2_3_2_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3_2_2"); textLabel2_2_2_2_3_2_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout11->addWidget(textLabel2_2_2_2_3_2_2, 1, 2); - textLabel2_2_2_2_3_2 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2_3_2"); + textLabel2_2_2_2_3_2 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3_2"); textLabel2_2_2_2_3_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout11->addWidget(textLabel2_2_2_2_3_2, 0, 2); - textLabel2_2_2_2_3 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2_3"); + textLabel2_2_2_2_3 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_3"); textLabel2_2_2_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout11->addWidget(textLabel2_2_2_2_3, 0, 0); - SR_B = Qt::LineEdit($LayoutWidget_7, "SR_B"); + SR_B = Qt::LineEdit($LayoutWidget_6, "SR_B"); $layout11->addWidget(SR_B, 0, 1); - textLabel2_2_2_2_2_3 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2_2_3"); + textLabel2_2_2_2_2_3 = Qt::Label($LayoutWidget_6, "textLabel2_2_2_2_2_3"); textLabel2_2_2_2_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); textLabel2_2_2_2_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); textLabel2_2_2_2_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); $layout11->addWidget(textLabel2_2_2_2_2_3, 1, 0); - SR_E = Qt::LineEdit($LayoutWidget_7, "SR_E"); + SR_E = Qt::LineEdit($LayoutWidget_6, "SR_E"); $layout11->addWidget(SR_E, 1, 1); + + my $LayoutWidget_7 = Qt::Widget(frame5, '$LayoutWidget_7'); + $LayoutWidget_7->setGeometry( Qt::Rect(640, 206, 106, 52) ); + my $layout28 = Qt::HBoxLayout($LayoutWidget_7, 0, 0, '$layout28'); + + my $layout25 = Qt::VBoxLayout(undef, 0, 0, '$layout25'); + + textLabel2_2_3_2 = Qt::Label($LayoutWidget_7, "textLabel2_2_3_2"); + textLabel2_2_3_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); + textLabel2_2_3_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); + textLabel2_2_3_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); + $layout25->addWidget(textLabel2_2_3_2); + + textLabel2_2_3 = Qt::Label($LayoutWidget_7, "textLabel2_2_3"); + textLabel2_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); + textLabel2_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); + textLabel2_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); + $layout25->addWidget(textLabel2_2_3); + $layout28->addLayout($layout25); + + my $layout26 = Qt::VBoxLayout(undef, 0, 0, '$layout26'); + + SAMHV = Qt::LineEdit($LayoutWidget_7, "SAMHV"); + $layout26->addWidget(SAMHV); + + BFIELD = Qt::LineEdit($LayoutWidget_7, "BFIELD"); + $layout26->addWidget(BFIELD); + $layout28->addLayout($layout26); + + my $layout27 = Qt::VBoxLayout(undef, 0, 0, '$layout27'); + + textLabel2_2_2_2_3_2_3_2 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2_3_2_3_2"); + textLabel2_2_2_2_3_2_3_2->setBackgroundMode( &Qt::Label::PaletteBackground() ); + textLabel2_2_2_2_3_2_3_2->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); + textLabel2_2_2_2_3_2_3_2->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); + $layout27->addWidget(textLabel2_2_2_2_3_2_3_2); + + textLabel2_2_2_2_3_2_3 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2_3_2_3"); + textLabel2_2_2_2_3_2_3->setBackgroundMode( &Qt::Label::PaletteBackground() ); + textLabel2_2_2_2_3_2_3->setPaletteForegroundColor( Qt::Color(0, 0, 0) ); + textLabel2_2_2_2_3_2_3->setPaletteBackgroundColor( Qt::Color(255, 255, 255) ); + $layout27->addWidget(textLabel2_2_2_2_3_2_3); + $layout28->addLayout($layout27); Tabs->insertTab( SpinRotator, "" ); Old = Qt::Widget(Tabs, "Old"); @@ -18490,9 +18517,6 @@ sub languageChange textLabel2_3_2_2_2->setText( trUtf8("Energy") ); ENERGY->setText( trUtf8("15.0") ); textLabel2_3_2_2_2_2->setText( trUtf8("keV") ); - textLabel2_2_3->setText( trUtf8("Field") ); - BFIELD->setText( trUtf8("0") ); - textLabel2_2_2_2_3_2_3->setText( trUtf8("T") ); textLabel2_2_2->setText( trUtf8("L3") ); TL->setText( trUtf8("9") ); textLabel2_2_2_2_3_2_2_2_2->setText( trUtf8("kV") ); @@ -18520,6 +18544,12 @@ sub languageChange SR_B->setText( trUtf8("-8.214") ); textLabel2_2_2_2_2_3->setText( trUtf8("SR_E") ); SR_E->setText( trUtf8("6.275") ); + textLabel2_2_3_2->setText( trUtf8("HV") ); + textLabel2_2_3->setText( trUtf8("Field") ); + SAMHV->setText( trUtf8("0") ); + BFIELD->setText( trUtf8("0") ); + textLabel2_2_2_2_3_2_3_2->setText( trUtf8("kV") ); + textLabel2_2_2_2_3_2_3->setText( trUtf8("T") ); Tabs->changeTab( SpinRotator, trUtf8("Spin Rotator") ); textLabel2_3_2_3_2->setText( trUtf8("L1") ); textLabel2_3_2_3->setText( trUtf8("L2") ); @@ -18774,7 +18804,7 @@ sub CreateAllInput { my %All=(); - my @AllParams= ("L1","L3","TL","BFIELD","RA_T","RA_B","RA_R","RA_L","SR_B","SR_E","ENERGY","NMuon", + my @AllParams= ("L1","L3","TL","BFIELD","SAMHV","RA_T","RA_B","RA_R","RA_L","SR_B","SR_E","ENERGY","NMuon", "L1_2","L2_2","L3_2","BFIELD_2","RA_T_2","RA_B_2","RA_R_2","RA_L_2","ENERGY_2", "MAC","musrSim","Geant4","ROOTSYS","TEMPL"); foreach my $Param (@AllParams) { @@ -18827,6 +18857,7 @@ sub StartCalc "L3"=>"L3VOLTAGE", "TL"=>"TLVOLTAGE", "BFIELD"=>"SAM_BFIELD", + "SAMHV"=>"SAM_HV", "RA_T"=>"RA_TVOL", "RA_B"=>"RA_BVOL", "RA_R"=>"RA_RVOL", diff --git a/geant4/PQt_musrSim/QmuSRSim.ui b/geant4/PQt_musrSim/QmuSRSim.ui index 7a70360..e93f4f8 100644 --- a/geant4/PQt_musrSim/QmuSRSim.ui +++ b/geant4/PQt_musrSim/QmuSRSim.ui @@ -231,88 +231,6 @@ - - - layout13 - - - - 604 - 230 - 130 - 26 - - - - - unnamed - - - 0 - - - 0 - - - - textLabel2_2_3 - - - PaletteBackground - - - - 0 - 0 - 0 - - - - - 255 - 255 - 255 - - - - <b><font size="+1">Field</font></b> - - - - - BFIELD - - - 0 - - - - - textLabel2_2_2_2_3_2_3 - - - PaletteBackground - - - - 0 - 0 - 0 - - - - - 255 - 255 - 255 - - - - T - - - - layout14 @@ -955,6 +873,194 @@ + + + layout28 + + + + 640 + 206 + 106 + 52 + + + + + unnamed + + + 0 + + + 0 + + + + layout25 + + + + unnamed + + + 0 + + + 0 + + + + textLabel2_2_3_2 + + + PaletteBackground + + + + 0 + 0 + 0 + + + + + 255 + 255 + 255 + + + + <b><font size="+1">HV</font></b> + + + + + textLabel2_2_3 + + + PaletteBackground + + + + 0 + 0 + 0 + + + + + 255 + 255 + 255 + + + + <b><font size="+1">Field</font></b> + + + + + + + layout26 + + + + unnamed + + + 0 + + + 0 + + + + SAMHV + + + 0 + + + + + BFIELD + + + 0 + + + + + + + layout27 + + + + unnamed + + + 0 + + + 0 + + + + textLabel2_2_2_2_3_2_3_2 + + + PaletteBackground + + + + 0 + 0 + 0 + + + + + 255 + 255 + 255 + + + + kV + + + + + textLabel2_2_2_2_3_2_3 + + + PaletteBackground + + + + 0 + 0 + 0 + + + + + 255 + 255 + 255 + + + + T + + + + + + diff --git a/geant4/PQt_musrSim/QmuSRSim.ui.h b/geant4/PQt_musrSim/QmuSRSim.ui.h index 6806fc0..37c2ccf 100644 --- a/geant4/PQt_musrSim/QmuSRSim.ui.h +++ b/geant4/PQt_musrSim/QmuSRSim.ui.h @@ -179,7 +179,7 @@ void QmuSRSim::helpAbout() void QmuSRSim::CreateAllInput() { my %All=(); - my @AllParams= ("L1","L3","TL","BFIELD","RA_T","RA_B","RA_R","RA_L","SR_B","SR_E","ENERGY","NMuon", + my @AllParams= ("L1","L3","TL","BFIELD","SAMHV","RA_T","RA_B","RA_R","RA_L","SR_B","SR_E","ENERGY","NMuon", "L1_2","L2_2","L3_2","BFIELD_2","RA_T_2","RA_B_2","RA_R_2","RA_L_2","ENERGY_2", "MAC","musrSim","Geant4","ROOTSYS","TEMPL"); foreach my $Param (@AllParams) { @@ -232,6 +232,7 @@ void QmuSRSim::StartCalc() "L3"=>"L3VOLTAGE", "TL"=>"TLVOLTAGE", "BFIELD"=>"SAM_BFIELD", + "SAMHV"=>"SAM_HV", "RA_T"=>"RA_TVOL", "RA_B"=>"RA_BVOL", "RA_R"=>"RA_RVOL", diff --git a/geant4/PQt_musrSim/SRBeamLine_Bend.mac b/geant4/PQt_musrSim/SRBeamLine_Bend.mac index 43f8f31..2e99275 100644 --- a/geant4/PQt_musrSim/SRBeamLine_Bend.mac +++ b/geant4/PQt_musrSim/SRBeamLine_Bend.mac @@ -296,7 +296,7 @@ # trigger foil is 52-55mm upstream of TrigV center # Carbon Foil (default HALF-thickness 0.000005147 mm, see below => CFoil thick = 10.3 nm). # USE THE NAME CFoil or coulombCFoil, otherwise musrMuFormation won't work! -/musr/command construct box CFoil 60 60 0.0000044 G4_GRAPHITE 0 0 -550 log_World norot dead 621 +/musr/command construct box CFoil 60 60 0.0000044 G4_GRAPHITE 0 0 -547 log_World norot dead 621 # Notes: NIST tables use G4_GRAPHITE with 1.7 g/cm3 and 78 eV ioniz. energy. # An area density of 2.20 ug/cm2 implies a CF thickn. = (2.20*1.e-6/1.70)*cm = 1.294e-5 mm - Total thickness @@ -536,6 +536,10 @@ /musr/command construct tubs SBField 0 0.01 0.005 0 360 G4_Galactic 0.0 0.0 15.0 log_World norot dead 709 nofield /musr/command globalfield SampleBField 0. 0. 15.0 fromfile 3DB wew_rs_ext.map log_SBField SAM_BFIELD +# Sample deceleration voltage (large sample plate) +/musr/command construct tubs SEField 0 0.01 0.005 0 360 G4_Galactic 0.0 0.0 14.9 log_World norot dead 709 nofield +/musr/command globalfield SampleEField 0 0 14.9 fromfile 2DE SamplePlate_2DE.map log_SEField SAM_HV + # Set parameters for particle tracking in an EM field /musr/command globalfield setparameter SetLargestAcceptableStep 5 /musr/command globalfield setparameter SetMinimumEpsilonStep 5e-5