BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /belle2/masterclass/js/belle2_gen.js @ 318

  → /belle2/masterclass/js/belle2_gen.js @ 319

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 318 → Rev 319

/belle2/masterclass/js/belle2_gen.js
1,3 → 1,4
Blockly.JavaScript['particle_combiner'] = function(block) {
var value_list1 = Blockly.JavaScript.valueToCode(block, 'list1', Blockly.JavaScript.ORDER_ATOMIC);
if (value_list1.length==0) value_list1='""';
7,11 → 8,10
var dropdown_sameparticles = block.getFieldValue('sameparticles');
var number_mass0 = block.getFieldValue('mass0');
var number_mass1 = block.getFieldValue('mass1');
var value_histogram = Blockly.JavaScript.valueToCode(block, 'histogram', Blockly.JavaScript.ORDER_ATOMIC);
if (value_histogram.length==0) value_histogram='""';
// TODO: Assemble JavaScript into code variable.
var code = '{"combiner":{"list1":' + value_list1 + ',"list2":' + value_list2 + ',"sameparticles":"'+ dropdown_sameparticles +'","pid":"' + dropdown_simplepid + '","m0":"' + number_mass0 + '","m1":"' + number_mass1 + '","histogram":' + value_histogram + '}}\n';
// TODO: Change ORDER_NONE to the correct strength.
var histograms = Blockly.JavaScript.statementToCode(block, 'histogram');
var code = '{"combiner":{"list1":' + value_list1 + ',"list2":' + value_list2 ;
code += ',"sameparticles":"'+ dropdown_sameparticles +'","pid":"' + dropdown_simplepid ;
code += '","m0":"' + number_mass0 + '","m1":"' + number_mass1 + '","histogram":[' + histograms + ']}}\n';
return [code, Blockly.JavaScript.ORDER_NONE];
};
20,11 → 20,10
if (value_list1.length==0) value_list1='""';
var dropdown_chargelist = block.getFieldValue('chargelist');
var dropdown_simplepid = block.getFieldValue('simplepid');
var value_histogram = Blockly.JavaScript.valueToCode(block, 'histogram', Blockly.JavaScript.ORDER_ATOMIC);
if (value_histogram.length==0) value_histogram='""';
// TODO: Assemble JavaScript into code variable.
var code = '{"selector":{"list1":' + value_list1 + ',"charge":"' + dropdown_chargelist + '","pid":"' + dropdown_simplepid + '","histogram":' + value_histogram + '}}\n';
// TODO: Change ORDER_NONE to the correct strength.
var histograms = Blockly.JavaScript.statementToCode(block, 'histogram');
var code = '{"selector":{"list1":' + value_list1 ;
code += ',"charge":"' + dropdown_chargelist ;
code += '","pid":"' + dropdown_simplepid + '","histogram":[' + histograms + ']}}\n';
return [code, Blockly.JavaScript.ORDER_NONE];
};
34,11 → 33,10
var number_min = block.getFieldValue('min');
var number_max = block.getFieldValue('max');
var dropdown_varname = block.getFieldValue('varname');
// TODO: Assemble JavaScript into code variable.
var code = '{"h1d":{"varname":"'+ dropdown_varname + '","name":"' + text_name + '","nbins":"' + number_nbins + '","min":"' + number_min + '","max":"' + number_max + '"}}\n';
// TODO: Change ORDER_NONE to the correct strength.
return [code, Blockly.JavaScript.ORDER_NONE];
var code = '{"h1d":{"varname":"'+ dropdown_varname + '",';
code = code + ' "name":"' + text_name + '","nbins":"' + number_nbins + '",';
code = code + ' "min":"' + number_min + '","max":"' + number_max + '"}}\n';
return code;
};
Blockly.JavaScript['simple_analysis'] = function(block) {
48,7 → 46,6
var dropdown_datasource = block.getFieldValue('datasource');
var value_list = Blockly.JavaScript.valueToCode(block, 'list', Blockly.JavaScript.ORDER_ATOMIC);
if (value_list.length==0) value_list='""';
// TODO: Assemble JavaScript into code variable.
var code = '{"analysis":{"neve":"' + number_neve + '","first":"' + number_first + '","print":"' + number_print + '","datasource":"' + dropdown_datasource + '","list":' + value_list + '}}\n';
return code;
57,9 → 54,7
Blockly.JavaScript['particle_mass_fix'] = function(block) {
var value_list = Blockly.JavaScript.valueToCode(block, 'list', Blockly.JavaScript.ORDER_ATOMIC);
if (value_list.length==0) value_list='""';
// TODO: Assemble JavaScript into code variable.
var code = '{"fix_mass":{"list":' + value_list + '}}\n';
// TODO: Change ORDER_NONE to the correct strength.
return [code, Blockly.JavaScript.ORDER_NONE];
};
66,8 → 61,6
Blockly.JavaScript['primary_list'] = function(block) {
var value_histogram = Blockly.JavaScript.valueToCode(block, 'histogram', Blockly.JavaScript.ORDER_ATOMIC);
if (value_histogram.length==0) value_histogram='""';
// TODO: Assemble JavaScript into code variable.
var code = '{"primary":' + '{"histogram":' + value_histogram + '}}\n';
// TODO: Change ORDER_NONE to the correct strength.
return [code, Blockly.JavaScript.ORDER_NONE];
};