Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 346 → Rev 347

/belle2/masterclass/JSRootExtend.js
173,11 → 173,11
}
 
if(funList[3]){
var BWParameters = ["N_{BW}", "#Gamma", "Mean_{BW}"]
var BWParameters = ["N_{BW}", "#Gamma", "M_{BW}"]
if((Npar > 0)){
formula.fFormula += " + ";
}
formula.fFormula += "[N_{BW}] * TMath::BreitWigner(x, [Mean_{BW}], [#Gamma])"; // * [Gamma] / ((x - [MeanBW])^2 + ([Gamma]/2)^2)
formula.fFormula += "[N_{BW}] * TMath::BreitWigner(x, [M_{BW}], [#Gamma])"; // * [Gamma] / ((x - [MeanBW])^2 + ([Gamma]/2)^2)
formula.fClingParameters.push(param[10]);
formula.fClingParameters.push(param[11]);
formula.fClingParameters.push(param[12]);
/belle2/masterclass/polFitPanel.js
489,7 → 489,7
if((Npar > 0)){
fName += " + ";
}
fName += "N_{BW} \\cdot \\frac{1}{2 \\pi} \\frac{\\Gamma}{(x - Mean_{BW})^2 + (\\Gamma/2)^2)} "; // * [Gamma] / ((x - [MeanBW])^2 + ([Gamma]/2)^2)
fName += "N_{BW} \\cdot \\frac{1}{2 \\pi} \\frac{\\Gamma}{(x - M_{BW})^2 + (\\Gamma/2)^2} "; // * [Gamma] / ((x - [MeanBW])^2 + ([Gamma]/2)^2)
Npar += 3;
}
624,6 → 624,7
mform += ' <option value="pol">Poly</option>'
mform += ' <option value="expo">Expo</option>'
mform += ' <option value="BW">Breit-Wigner</option>'
mform += ' <option disabled="disabled">--------</option>'
mform += ' <option value="gaus+pol">Gaus + Poly</option>'
mform += ' <option value="gaus+expo">Gaus + Expo</option>'
mform += ' <option value="BW+gaus">Gaus + Breit-Wigner</option>'
630,6 → 631,7
mform += ' <option value="pol+expo">Poly + Expo</option>'
mform += ' <option value="BW+pol">Poly + Breit-Wigner</option>'
mform += ' <option value="BW+expo">Expo + Breit-Wigner</option>'
mform += ' <option disabled="disabled">--------</option>'
mform += ' <option value="BW+expo+pol">Breit-Wigner + Poly + Expo</option>'
mform += ' <option value="BW+gaus+pol">Breit-Wigner + Poly + Gaus</option>'
mform += ' <option value="BW+expo+gaus">Breit-Wigner + Expo + Gaus</option>'
636,7 → 638,7
mform += ' <option value="gaus+pol+expo">Gaus + Poly + Expo</option>'
mform += ' <option value="BW+expo+gaus+pol">Breit-Wigner + Expo + Gaus + Poly</option>'
mform += ' </select>'
mform += ' <span id="functionDisplay'+sframe+'"></span>'
mform += ' <span id="functionDisplay'+sframe+'" style="font-size:32px"></span>'
mform += ' </div>'
mform += ' <!--'
mform += ' This was replaced b select:option'
676,7 → 678,7
mform += ' <td><input type="text" class="inputParam" id="ParamSigmastep'+sframe+'" name="Sigma" value="0.1" onkeyup="updateSetSlider(this)"></td>'
mform += ' </tr>'
mform += ' <tr id="listAmplitude">'
mform += ' <td><li>A:</td>'
mform += ' <td><li>N:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixAmplitude'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondAmplitude'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamAmplitude'+sframe+'" name="Amplitude" value="1" onblur="updateSetSlider(this)"></td>'
705,7 → 707,7
mform += ' <td>Step</td>'
mform += ' </tr>'
mform += ' <tr class="pol" id="listA0'+sframe+'">'
mform += ' <td><li>A0:</td>'
mform += ' <td><li>p0:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixA0'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondA0'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamA0'+sframe+'" name="A0" value="0" disabled=true onblur="updateSetSlider(this)"></td>'
716,7 → 718,7
mform += ' </tr>'
mform += ' <tr class="pol" id="listA1'+sframe+'">'
mform += ' <div id="rowA1">'
mform += ' <td><li>A1:</td>'
mform += ' <td><li>p1:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixA1'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondA1'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamA1'+sframe+'" name="A1" value="0" disabled=true onblur="updateSetSlider(this)"></td>'
727,7 → 729,7
mform += ' </div>'
mform += ' </tr>'
mform += ' <tr class="pol" id="listA2'+sframe+'">'
mform += ' <td><li>A2:</td>'
mform += ' <td><li>p2:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixA2'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondA2'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamA2'+sframe+'" name="A2" value="0" disabled=true onblur="updateSetSlider(this)"></td>'
737,7 → 739,7
mform += ' <td><input type="text" class="inputParam" id="ParamA2step'+sframe+'" name="A2" value="0.1" onkeyup="updateSetSlider(this)"></td>'
mform += ' </tr>'
mform += ' <tr class="pol" id="listA3'+sframe+'">'
mform += ' <td><li>A3:</td>'
mform += ' <td><li>p3:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixA3'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondA3'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamA3'+sframe+'" name="A3" value="0" disabled=true onblur="updateSetSlider(this)"></td>'
747,7 → 749,7
mform += ' <td><input type="text" class="inputParam" id="ParamA3step'+sframe+'" name="A3" value="0.1" onkeyup="updateSetSlider(this)"></td>'
mform += ' </tr>'
mform += ' <tr class="pol" id="listA4'+sframe+'">'
mform += ' <td><li>A4:</td>'
mform += ' <td><li>p4:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixA4'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondA4'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamA4'+sframe+'" name="A4" value="0" disabled=true onblur="updateSetSlider(this)"></td>'
785,7 → 787,7
mform += ' <td><input type="text" class="inputParam" id="ParamGammastep'+sframe+'" name="Gamma" value="0.1" onkeyup="updateSetSlider(this)"></td>'
mform += ' </tr>'
mform += ' <tr id="listM">'
mform += ' <td><li>M:</td>'
mform += ' <td><li>M<sub>BW</sub>:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixM'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondM'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamM'+sframe+'" name="M" value="1" onblur="updateSetSlider(this)"></td>'
795,7 → 797,7
mform += ' <td><input type="text" class="inputParam" id="ParamMstep'+sframe+'" name="M" value="0.1" onkeyup="updateSetSlider(this)"></td>'
mform += ' </tr>'
mform += ' <tr id="listAmpBW">'
mform += ' <td><li>A:</td>'
mform += ' <td><li>N<sub>BW</sub>:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixAmpBW'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondAmpBW'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamAmpBW'+sframe+'" name="AmpBW" value="1" onblur="updateSetSlider(this)"></td>'
832,7 → 834,7
mform += ' <td><input type="text" class="inputParam" id="ParamKstep'+sframe+'" name="K" value="0.1" onkeyup="updateSetSlider(this)"></td>'
mform += ' </tr>'
mform += ' <tr id="listAmpExp">'
mform += ' <td><li>A:</td>'
mform += ' <td><li>N<sub>exp</sub>:</td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="fixAmpExp'+sframe+'"></td>'
mform += ' <td><input type="checkbox" class="inputParamBox" id="bondAmpExp'+sframe+'"></td>'
mform += ' <td><input type="text" class="inputParam" id="ParamAmpExp'+sframe+'" name="AmpExp" value="1" onblur="updateSetSlider(this)"></td>'
/belle2/masterclass/style.css
54,6 → 54,7
 
.inputParametersTable{
text-align: center;
margin-left: 20px;
width: 700px;
}