- Oct 10, 2022
-
-
Gitlab CI authoredpatch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/25083385
d2a88929 -
Paras Naik authored
PN deleted things that will not be needed, but a lot of stuff we are still unsure about so that has been commented. Some Gaudi stuff remains uncommented. Have no idea if we will need it or not.
2c63a1ea -
6ca9797e
-
- Aug 04, 2022
-
-
be099ea6
-
- Aug 01, 2022
-
-
2b315762
-
- Jul 16, 2022
-
-
Gitlab CI authored
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/23323165
d1e1a996 -
Paras Naik authored
Added useYAML flag, currently hardcoded. Add a separate section for substituting our conditions if useYAML is True; eventually we will want to put YAML conditions and use yml files in this section.
46c08864
-
- Jul 15, 2022
-
-
Gitlab CI authored
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/23299945
df113a6b -
Paras Naik authored
Moved all CondDB stuff to the end of patchMoore. Added flag (currently hardcoded) useAlignConds to turn off using the mirror alignment conditions.
f19703a0 -
21ad08a0
-
- Jul 06, 2022
-
-
Gitlab CI authored
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/23075281
4b76d6f8 -
3b3cd751
-
Paras Naik authoredf23e7adf
-
Gitlab CI authored
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/23073401
cf43c003 -
Paras Naik authored47c94913
-
Paras Naik authoreda305e61d
-
Paras Naik authored
Merge branch 'pnaik_Run3MirrOnline_202205' of ssh://gitlab.cern.ch:7999/lhcb/Panoptes into pnaik_Run3MirrOnline_202205
5d5c116d -
5d7419a7
-
Updated Configuration.py to look for Rich1CombAndMirrSubsets.txt and Rich2CombAndMirrSubsets.txt in Rich/RichMirrorAlignmentOnline/files/CombAndMirrSubsets/
ee4379cb -
moved Rich1CombAndMirrSubsets.txt and Rich2CombAndMirrSubsets.txt into Rich/RichMirrorAlignmentOnline/files/CombAndMirrSubsets
8320601e -
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/23014513
62e54cf3 -
Changed the settings names for the .conf files in RichAlignmentHelper to the new names chosen by Anatoly. Note that the names in the Iterator Configuration still currently remain the same. Note that the 'printMode' option is currently hard coded to 2. Note that the mirrCombsFile now refers to a .py in MirrCombinFit and a .yml in MirrAlign, so using self.combAndMirrSubsetswon't work in the long run... this may require two separate settings or we will come up with a clever way to still use one if possible.
62483a95 -
90eea0c1
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22974720
dbb73f72 -
bcb8dc9d -
fb012189
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22557696
25c62dd9 -
99f55c26
-
3f46a676
-
updated Iterator to set up the alignment for several scenarios, we should now (in principle) be able to take in and output a YAML (YAML or XML) file with the mirror conditions and reconstruct/align with DD4Hep (DetDesc), always giving the reconstruction YAML (XML) if DD4Hep (DetDesc) and always giving the core code (MirrCombinFit and MirrAlign) YAML.
3064b184 -
2c0b0301
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22551798
de11176b -
b312c299
-
8f46a2c2
-
13c22873
-
ab7976cb
-
74b86614
-
07e7bb7c
-
d2ca8d0b
-
eab77111
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22408195
562eb1d2 -
088bf56d
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22327822
bb0a2a30 -
Changed iterator.py so that if useYAML is True every operation needing a file with our conditions expects a YAML file, otherwise it expects an XML file. NB: the core codes (MirrAlign, MirrCombinFit) will only use YAML soon, so we still need to add converters before and after running the core codes if using XML files.
d3c6bd77 -
63e9e97f
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22118647
026f9a57 -
408108e5
-
0b754ceb
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22118591
845b802e -
85653ddc
-
917f16e8
-
c2c21a4b
-
aac061e1
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22118437
e7400841 -
a7b70b58
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22118010
2dfd6ede -
4e6e2a1d
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22117958
607cd888 -
14947da3
-
6508e2b4
-
20c5ecd2
-
ae20c6e5
-
0d3cd2d0
-
8664fd7b
-
add a configurable useYAML to Configuration.py which is True when the starting v-numbered file is expected to be YAML instead of XML. This will also trigger the use of startYAMLFile and compareYAMLFile instead of startXMLFile and compareXMLFile. Updated SetupHelper.py to print the value of useYAML in the summary file.
76e6b24d -
a5c03c88
-
96b82038
-
a520eaa1
-
Because RichMirrAlign now only deals with YAML instead of XML, all references to XML have been replaced with YAML, and all .xml has been replaced with .yml, in RichAlignmentHelper.py
3d0bef2a -
32344522
-
474ae496
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22116604
bc66cf27 -
in trendHelper.py, enable ability to do a setchangeYAML in tiltObj when the files being compared are both YAML files. Note that if the files being compared are not both XML or both YAML, there will be an ERROR message printed, and the getChange will be incorrect or will fail.
0e24a2d0 -
in fileFinder.py, we now can look for XML or YAML files within each previous alignment directory... if XML files found then these are stored in fullFiles, otherwise YAML files are stored in fillFiles.
8ac16c69 -
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22100629
19207046 -
Have SetupHelper.py print XML_YAML_configDir, startYAMLFile, and compareYAMLFile in the summaryFile.
d9026dbf -
in SetupHelper.py, change the monitor() function to take compareFILE (changed from compareXML, in preparation for when the file is YAML)
c8bfab6a -
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22100327
174979a5 -
In AlignMonitor.py, change performMonitoring() so that if it gets a YAML file as the compareFILE (formerly compareXML), it will look for an YAML file version of the CondDBUpdate file from each iteration (iterationFILE, formerly XMLFile). Otherwise if compareFILE is not a YAML file, it will look for an XML file.
46574903 -
c9a8f4f3
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22098818
0f6aefb8 -
1f359325
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22098283
e17d3aba -
Get the configuration path for the XML-YAML converter from the main Configuration, if a Configuration is provided. Move sys.path.append items within the Conversion class. Removed self.base_dir as we didn't need that. Changed blisted_conds_path to self.blistedCondsPath within the Conversion class. Get the blacklisted conditions path for the XML-YAML converter from the main Configuration, if a Configuration is provided (currently using 'WorkDir').
49e200fa -
Defined new configurable XML_YAML_configDir in Configuration.py that points to the directory at the pit that contains the configuration files for the XML-YAML converter.
c473a1b9 -
Changed the location of where to find Configuration.py at the pit from group/rich/sw/cmtuser/AlignmentRelease/ to /group/rich/sw/alignment/stack/Panoptes/
46367c4a -
Moved the Configuration_files directory for the XML-YAML converter into Rich/RichMirrorAlignmentOnline/files and renamed it to XML_YAML_config
8db6e28b -
Changed /group/rich/sw/cmtuser/AlignmentRelease/ to /group/rich/sw/alignment/stack/Panoptes/ as the base directory for our code at the pit (this is used only to locate items in the Rich/RichMirrorAlignmentOnline/files/ directory).
1be9c641 -
c980b835
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22096969
9e4bb9c1 -
Get which Rich detector from configuration, if configuration is provided. Defined self.base_dir, but not doing anything with it yet. Providing config_path and self.whichRich to tack_on_off(), removing the dependency on convert_XML_YAML from objects.py.
032de8e6 -
24179e0a
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22095730
7b85af99 -
adb77168
-
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22083860
02cb85e8 -
added YAMLFileHelper.py, which will eventually replace XMLFileHelper.py [work on YAML coeff calib tilts done by Vidar Marsh]. However until we use DD4HEP we still need XML capabilities.
3b2780b9 -
Updated Configuration.py with startYAMLFile and compareYAMLFile configurables. For now startXMLFile and compareXMLFile still exist also, but once things are working with YAML these will be removed.
b1ee8fdc -
patch generated by https://gitlab.cern.ch/lhcb/Panoptes/-/jobs/22080492
3fafe745 -
Added setchangeYAML() and yamlToDict() to tiltObj [work by Vidar Marsh] to help create monitoring plots using YAML instead of XML. Change Print statements in tiltObj.py to be compatible with Python 3.
afe63e72 -
Change Print statements in XMLFileHelper.py to be compatible with Python 3. File now consistent with Vidar Marsh's code.
fc22cdd7
-
