Skip to content

Bug fix: Check remote branches for DSID assignment

Spyros Argyropoulos requested to merge fixremote into master

In the DSID checking the script would only check local branches not remote ones. This MR fixes the bug.

Test

Tested locally with the following branches:

  LogParserStandalone
  br_fix_jocheck
  commit
  dsid_sargyrop_sherpa/triphoton/mc.Sh_example.py
  fix
* fixremote
  logParser
  master
  message

Printing the occupiedDSIDs in check_jo_consistency.py gives:

python scripts/check_jo_consistency_main.py 100xxx/100000/mc.MGPy8_exa.py

===> Checking jobOption consistency...


Modified jO file: 100xxx/100000/mc.MGPy8_exa.py - jO file = mc.MGPy8_exa.py
	OK: New jobOption file
	OK: name format correct
	OK: MGPy8_exa physicsShort less than 50 characters long
	OK: 2 physicsShort parts found
	OK: Loading generator list file from /Users/sargyrop/Desktop/mcjoboptions_2/scripts/../common/GeneratorList.txt
	OK: No generator full name is found
	Generators used:  ['MG', 'Py8']
	ERROR: DSID:100000, generator:MG => allowed DSID range 500000 - 599999
[500000, 500001, 500004, 500005, 500006, 500007, 500008, 500009, 500010, 500011, 500012, 500013, 500016, 500017, 500018, 500019, 500020, 500021, 500022, 500023, 500024, 500025, 500026, 500027, 500028, 500029, 500030, 500031, 500032, 500033, 500034, 500035, 500036, 500037, 500038, 500039, 500040, 500041, 500042, 500043, 500044, 500045, 500046, 500047, 500048, 500049, 500050, 500051, 500052, 500053, 500054, 500055, 500056, 500057, 500058, 500059, 500060, 500061, 500062, 500063, 500064, 500065, 500066, 500067, 500068, 500069, 500070, 500071, 500072, 500073, 500074, 500075, 500076, 500077, 500078, 500079, 500080, 500081, 500082, 500083, 500084, 500085, 500086, 500087, 500088, 500089, 500090, 500091, 500092, 500093, 500094, 500095, 500096, 500097, 500098, 500099, 500100, 500101, 500102, 500103, 500104, 500105, 500106, 500107, 500108, 500109, 500110, 500111, 500112, 500113, 500114, 500115, 500116, 500117, 500118, 500119, 500120, 500121, 500122, 500123, 500124, 500125, 500126, 500127, 500128, 500129, 500130, 500131, 500132, 500133, 500134, 500135, 500136, 500137, 500138, 500139, 500140, 500141, 500142, 500143, 500144, 500145, 500146, 500147, 500148, 500149, 500150, 500151, 500152, 500153, 500154, 500155, 500156, 500157, 500158, 500159, 500160, 500161, 500162, 500163, 500164, 500165, 500166, 500167, 500168, 500169, 500170, 500171, 500172, 500173, 500174, 500175, 500176, 500177, 500178, 500179, 500180, 500181, 500182, 500183, 500184, 500185, 500186, 500187, 500188, 500189, 500190, 500191, 500192, 500193, 500194]
		ERROR: Move 100xxx/100000 -> 500xxx/500002
	OK: file does not contain includes pointing to MC15JobOptions


===> Errors found - check output of individual checks above

Notice that e.g. 500004 and 500005 are in dsid_ewelina_... and not in the branches that I had locally. If I would use /refs/heads in the git ls command I would get instead

===> Checking jobOption consistency...


Modified jO file: 100xxx/100000/mc.MGPy8_exa.py - jO file = mc.MGPy8_exa.py
	OK: New jobOption file
	OK: name format correct
	OK: MGPy8_exa physicsShort less than 50 characters long
	OK: 2 physicsShort parts found
	OK: Loading generator list file from /Users/sargyrop/Desktop/mcjoboptions_2/scripts/../common/GeneratorList.txt
	OK: No generator full name is found
	Generators used:  ['MG', 'Py8']
	ERROR: DSID:100000, generator:MG => allowed DSID range 500000 - 599999
[500000, 500001, 500013, 500016, 500017, 500018, 500019, 500020, 500021, 500022, 500023, 500024, 500025, 500026, 500027, 500028, 500029, 500030, 500031, 500032, 500033, 500034, 500035]
		ERROR: Move 100xxx/100000 -> 500xxx/500002
	OK: file does not contain includes pointing to MC15JobOptions


===> Errors found - check output of individual checks above

Merge request reports