From 006240693113365af19ecb7a55540e95a9c684c2 Mon Sep 17 00:00:00 2001 From: maffettone Date: Sat, 13 Apr 2024 08:45:20 -0700 Subject: [PATCH] refactor and recovery --- .../{ => mmm3-ramadan}/mm3-sva-pdf.py | 1 + .../{ => mmm3-ramadan}/mmm3-monarch1.py | 0 .../{ => mmm3-ramadan}/mmm3-sva-xrd.py | 0 .../{ => mmm4-hanukkah}/historical_uids.txt | 0 .../{ => mmm4-hanukkah}/mmm4-kmeans-local.py | 0 .../{ => mmm4-hanukkah}/mmm4-kmeans.py | 0 .../mmm5-tax-day/fri-gsas-out-uids.txt | 86 +++++++++++++++++++ .../mmm5-tax-day/fri-peak-fit-out-uids.txt | 86 +++++++++++++++++++ .../mmm5-tax-day/kmeans-gsas.py | 12 +++ .../mmm5-tax-day/kmeans-peakfit.py | 12 +++ .../startup_scripts/mmm5-tax-day/sva-gsas.py | 12 +++ .../mmm5-tax-day/sva-peakfit.py | 12 +++ 12 files changed, 221 insertions(+) rename pdf_agents/startup_scripts/{ => mmm3-ramadan}/mm3-sva-pdf.py (99%) rename pdf_agents/startup_scripts/{ => mmm3-ramadan}/mmm3-monarch1.py (100%) rename pdf_agents/startup_scripts/{ => mmm3-ramadan}/mmm3-sva-xrd.py (100%) rename pdf_agents/startup_scripts/{ => mmm4-hanukkah}/historical_uids.txt (100%) rename pdf_agents/startup_scripts/{ => mmm4-hanukkah}/mmm4-kmeans-local.py (100%) rename pdf_agents/startup_scripts/{ => mmm4-hanukkah}/mmm4-kmeans.py (100%) create mode 100644 pdf_agents/startup_scripts/mmm5-tax-day/fri-gsas-out-uids.txt create mode 100644 pdf_agents/startup_scripts/mmm5-tax-day/fri-peak-fit-out-uids.txt diff --git a/pdf_agents/startup_scripts/mm3-sva-pdf.py b/pdf_agents/startup_scripts/mmm3-ramadan/mm3-sva-pdf.py similarity index 99% rename from pdf_agents/startup_scripts/mm3-sva-pdf.py rename to pdf_agents/startup_scripts/mmm3-ramadan/mm3-sva-pdf.py index 83b8c82..c1031aa 100644 --- a/pdf_agents/startup_scripts/mm3-sva-pdf.py +++ b/pdf_agents/startup_scripts/mmm3-ramadan/mm3-sva-pdf.py @@ -1,4 +1,5 @@ """SVA agent, that finds regions fo scientific value, and tiggers PDF to supplement XRD.""" + from bluesky_adaptive.server import register_variable, shutdown_decorator, startup_decorator from pdf_agents.scientific_value import ScientificValueAgentBase diff --git a/pdf_agents/startup_scripts/mmm3-monarch1.py b/pdf_agents/startup_scripts/mmm3-ramadan/mmm3-monarch1.py similarity index 100% rename from pdf_agents/startup_scripts/mmm3-monarch1.py rename to pdf_agents/startup_scripts/mmm3-ramadan/mmm3-monarch1.py diff --git a/pdf_agents/startup_scripts/mmm3-sva-xrd.py b/pdf_agents/startup_scripts/mmm3-ramadan/mmm3-sva-xrd.py similarity index 100% rename from pdf_agents/startup_scripts/mmm3-sva-xrd.py rename to pdf_agents/startup_scripts/mmm3-ramadan/mmm3-sva-xrd.py diff --git a/pdf_agents/startup_scripts/historical_uids.txt b/pdf_agents/startup_scripts/mmm4-hanukkah/historical_uids.txt similarity index 100% rename from pdf_agents/startup_scripts/historical_uids.txt rename to pdf_agents/startup_scripts/mmm4-hanukkah/historical_uids.txt diff --git a/pdf_agents/startup_scripts/mmm4-kmeans-local.py b/pdf_agents/startup_scripts/mmm4-hanukkah/mmm4-kmeans-local.py similarity index 100% rename from pdf_agents/startup_scripts/mmm4-kmeans-local.py rename to pdf_agents/startup_scripts/mmm4-hanukkah/mmm4-kmeans-local.py diff --git a/pdf_agents/startup_scripts/mmm4-kmeans.py b/pdf_agents/startup_scripts/mmm4-hanukkah/mmm4-kmeans.py similarity index 100% rename from pdf_agents/startup_scripts/mmm4-kmeans.py rename to pdf_agents/startup_scripts/mmm4-hanukkah/mmm4-kmeans.py diff --git a/pdf_agents/startup_scripts/mmm5-tax-day/fri-gsas-out-uids.txt b/pdf_agents/startup_scripts/mmm5-tax-day/fri-gsas-out-uids.txt new file mode 100644 index 0000000..5238bd8 --- /dev/null +++ b/pdf_agents/startup_scripts/mmm5-tax-day/fri-gsas-out-uids.txt @@ -0,0 +1,86 @@ +a79d9b46-5a2f-4cab-ba3d-3ac1b139a236 +cb6e301c-9eaf-4de0-aee7-eb6ed4445f38 +e2e76895-1d7a-42d0-89c1-0fa1e2452c7b +82d6f63c-5601-4f17-aa4f-683469e47754 +0ed346fa-3f9e-4741-ad5e-c227bfb5b2ca +a7d5305a-0b57-4b2a-ae64-e0045c07b0c1 +4926f36a-b5cd-4472-9a2b-f0c30cb23da1 +88490f41-de7c-4a8a-a1d1-50412eb6f4bd +2937ccd1-03ed-407d-a418-6b4c99513d6e +0832b457-3d9b-41b3-beba-d17f17e35b36 +ba2b74f4-6888-4671-a4fc-b6c67cab278a +60483be2-8727-40e1-91e6-f399600b901c +0a7e514e-bcf0-40d8-a656-d3069403abdd +8d1e384d-e1f3-4f3f-a0f2-507fd8036930 +b5f8fa3e-05ae-42f7-809d-f8b254f6d1b3 +ec576e99-66d2-462d-8f47-ae0eadde168e +503ea3a1-aa2b-4a2c-bca7-8c8c0bc718d1 +77f1e66f-3581-470d-87cb-7d705e059db2 +ba769bd8-9092-4a07-b7d0-31643bfce71d +6a85c69c-7dde-4f96-956d-e614e6b04a47 +dc3682cc-670f-4437-ba51-102123b0305c +3a908a00-3bb5-4c42-b05e-9de756198704 +21142718-18a7-4696-a5bd-cdc435bb6e5b +fb65ffab-5741-4df7-bfa0-49984ce55700 +c62627d4-5f3a-4867-a94c-74f1d6d03ee1 +d0ac6050-c98a-4759-9b13-663813b5443c +6afdddcf-a86e-420e-b886-4cebcbf794b7 +11d3617b-0d8f-4da0-b659-1ca6dbe59723 +50a9d89a-fad4-46e9-8131-f83ceaf422d9 +251d739c-604b-4a0c-ae45-24f8ba92f420 +27c78a48-53ff-4388-ae57-2a0dfbdc6702 +cdc31edc-a519-4177-9c4b-c45f4c70bfd8 +8f289544-1bd3-48a0-9919-3cf73ce558e2 +5bbcbc08-bddf-45fd-b30a-517577d7a9a2 +6122edbb-f36d-443b-b549-ddc7526823f5 +bea48b4e-a2d7-41a4-9797-386a6d737c42 +f44f4c31-cc4e-4278-805d-76412c54e5d8 +54235711-5aec-4d96-8145-5a27b4b78372 +d9da686b-16c6-48f2-82cc-e8ca0e5b3d57 +748e7965-61ba-4456-8175-6979aa03e07d +fcd676a5-d661-4365-934f-7f3bf29e3e09 +1ac8849a-40a0-428b-9d4c-7cc799be2f3c +f8935001-1db7-4586-b57d-d4e0b9a9daab +4aaed270-0ad8-432b-9bfd-e0da38852d95 +23a1fb11-690b-4494-81c3-3ba4d63fc076 +e1f96658-a1be-4d4c-ae39-bde5c4a8eab3 +361c765c-90a0-4482-8caa-42b0583a0582 +0676e08c-53c4-4595-a7ca-4f74c75520db +5ef58a02-e7e8-4b0a-b777-8ba33a321efe +ada119e6-d657-4b28-816a-25b5c4fc122c +6cad4b98-d4f2-4a1f-91dd-e82b36cb27b1 +c80a01b4-cfc4-44ed-adcd-1e69e3f84de3 +1c6c6acf-2af1-44ab-b33d-85085186e6d8 +d40e0aa7-15f0-47dd-bfe4-61be93ef5e87 +85a43bb9-945d-455b-9d40-2748f5cb38a5 +cb659745-4983-4323-9d1d-ba4f8880df92 +643ac4b9-6c7a-40c7-ae24-a47966e89092 +00a712bd-39b2-437a-92d1-a9e4d3c62690 +3f392382-a6fd-4aa6-94eb-b8b41b24eaad +72b8d007-984c-46df-acef-4212d3918e52 +3f2812a8-a8e3-4c96-ad39-0fe639cebafc +41924cb3-0e1d-499d-b9b0-29cd1bd3ead9 +bc5aca9f-fc84-4a8d-9456-a1714262b5a4 +fa0cf8ab-2241-41af-b568-8f98cebc42f4 +8cfb56bb-5df2-4813-88d9-639b700594f7 +3c261c19-76ab-4c5d-925f-d0b87087c740 +47517fa7-0b64-4742-8215-5ead0cb69a47 +dd704411-e11f-4e20-96c4-7f8a0c17766c +bf853e26-b605-465c-8a83-6890886240c7 +eff8db31-2468-45ce-846e-c2feff47d923 +f6979ec5-8059-4ed5-a092-b90463bf6461 +13745e26-2bf3-45ab-8f2d-7ed3393fd00f +71841e1c-d7bb-45c9-aba2-82d6dbd188de +4cd5b522-754b-4f28-935a-56b0030f4cde +0d92f5d1-768c-4c1c-86ee-d34befba0ee4 +1263f7f9-0267-4152-a5f4-92a2692b49f7 +05fb49b7-d3cf-4b00-9267-9cd034208435 +87a0de5b-4936-4959-bd8e-b176c4d5c9bc +bd406b05-6c72-44e1-8090-6830ee8f6c68 +8154a7aa-37dd-4a55-994b-a8760afed363 +9a71a48e-6748-4958-b01b-69e985f24849 +e8af1eb3-f17a-4ccc-9a9f-afa4a7580a67 +bedc2127-c5ae-4c56-bb26-466a7d4136c5 +0f879cba-1ce3-4d17-8a6d-11145a06b52a +67e68620-3613-4410-b998-89cee7af827b +16920069-f91e-4e67-9ead-561bde492123 diff --git a/pdf_agents/startup_scripts/mmm5-tax-day/fri-peak-fit-out-uids.txt b/pdf_agents/startup_scripts/mmm5-tax-day/fri-peak-fit-out-uids.txt new file mode 100644 index 0000000..f2a469b --- /dev/null +++ b/pdf_agents/startup_scripts/mmm5-tax-day/fri-peak-fit-out-uids.txt @@ -0,0 +1,86 @@ +9aea7b7e-67ed-487a-b32a-2c87f2b8413c +3ab59ee2-e23c-4aa4-86ea-4fcd620b5818 +5af7c2e3-5b5e-4c44-8b53-7f2033d03a7f +f58c4a8f-7aba-47ec-acae-5b39e9cf3b2e +23610db9-3230-4dc1-b72f-1a0b80689625 +a3c73d4d-e3f4-4d17-91af-98e5177e7795 +0cf14b22-6918-429d-bac2-a2c004dcd6e2 +3c9f9a02-c64f-4a22-8909-235d46f55b0c +e1d92abf-e80b-4d4c-b7c0-91557346135f +19d26f8d-aeae-46e2-9bb7-2aa120b6e95b +6d3b7223-3489-473f-8b62-8b0ee3c30dbd +4c92355f-67ca-4097-a318-93aa06d1bc7e +d8a83dc7-de9d-4082-abb8-033fa985d6a5 +b1f627ae-6639-40c6-9046-f3405222fe7c +ca05adf5-b714-47f4-adbe-f61a2a5c9b64 +c15614f0-c458-4de3-9247-abbe7542dd31 +bad9bcdf-d673-413f-ae5b-e36dc619a3a3 +db7ada67-868f-4afa-84c3-c39e7b407fc4 +1d25ea51-6b8d-4308-81dc-b3da57086fb5 +f724f32f-596a-474e-98be-4244866884f8 +f167e08c-16d6-4b0b-8d74-3ff95ce82e58 +75a73893-46ed-4581-8684-0697d47af6b2 +89419905-ebc4-44e1-bf23-7bca498ed4a3 +e6e7b73f-c37e-4834-be2b-f358a1434142 +86e22676-9396-4899-8b26-812b9e68fed1 +613a1db7-f41a-48a9-9356-baa88ee255e3 +7c918566-5527-43f9-9618-df1b6be2a488 +3cc1c822-021e-4e0a-89e8-755593b68325 +39708965-2b2a-4ac0-aae1-55088a7547a7 +d97dd3a6-f223-4205-bc54-1430f2123f2d +e7f1d012-9fa8-4b74-a3be-a6360d025025 +3ff4de57-dfc3-40c3-ba43-b95e774d2cc8 +44d8b6dd-37f9-42a6-9a39-6d8185b086ca +5b8aca77-15ba-4b5f-9e69-d18c17ba42d5 +12bea387-03e0-4072-bdbf-46751285da22 +9d9a3e0c-d98c-4869-a924-5d1a8c0de77a +03a0f0a5-eb49-4c16-9209-66c53f55bcc9 +a446f24c-3aa7-43c1-bf58-180db6fbb6db +ddbb71fc-ae3d-4646-bd44-a604a28dec4f +4fe35ad6-5fed-44af-b229-6f00d676a0ce +d8b61d2b-1495-4d75-8728-7509c15778c5 +ddfe771f-9577-4620-b1ff-ed45f148e052 +0e440b79-ccf5-41cb-bb38-dc901292febc +f8260cd0-cebc-45bf-803c-7ee2de15d3e7 +f77028f0-440a-460b-bc1b-a3a082e39d2c +4e7e64ab-1a5b-40a9-bb2b-693aae7ab33e +5836e35e-ae6e-4d86-bf06-3ab98e55fae4 +c0df0e37-987f-43c1-84f6-193dbe67a71d +f198942c-1e20-45c9-9214-46ad47670ef1 +e2d0a37e-9bb5-4893-a6f7-ceeefd691fad +15fbc759-637e-4146-aa49-161e448035ea +a9a7c061-7c7c-437d-85a9-f3b210182f10 +5fec237d-f5f1-4323-91c6-837d24fc9dc6 +44d8df39-ac40-48c3-89f6-44b59f7d8f6e +0badbf7f-9c58-4da8-88fe-0c65e5d0427a +f656e448-9d90-4432-b01b-4ceb60a23eb8 +c48cd821-4aa0-440f-ad54-121ae80c0816 +5f482a7d-d77b-47ea-82e9-d36b285e184a +87bbfc19-3af6-487d-a337-6f952eed3bd6 +74f5417d-bdab-4820-9fdb-adbc7c77cbf8 +b06ce1d0-4013-4cee-8e69-512d1810455a +d597258b-7408-4698-8c73-5ecd11986a94 +ebed0a60-e039-4149-ab60-b741a8709ee3 +0d2e9470-4601-44d7-8c0f-7a5c6c9e2525 +990f27d3-844d-4d69-8be6-cb998ce40dfb +b6cd692d-1d35-46ea-9a65-3d7ff5565134 +d1722363-f494-46c6-8217-96d5c4f0c8f1 +b3483d5d-bc94-4f47-a07c-2a43e7972373 +5ae7fdd9-e1eb-4457-9de3-f5818a1e7432 +03f5b3f9-b47c-4544-9e5a-6f0f335e6594 +56c803f2-dc13-4aeb-a49b-5e49a4747059 +9360b9af-ad50-4799-a077-e3295a48091c +a7e22c13-316b-4f0e-973d-d3fe79a6ab9e +3e73ac06-ea4c-401c-b10a-769405a8c957 +2e754715-c609-4e00-badf-aa597e4e04e7 +3907446a-9762-4ff7-ae59-ba96bd564eef +c192d1ea-f543-4d66-b4cf-9d58b2031d48 +5cdaca96-50da-4f70-abff-544ad629257d +e001c7c6-23a5-47a0-beac-ef5c9c110fc7 +e6cab9c5-e963-4110-9554-3d8bc659948b +5003545b-17e7-4692-85b2-53ac734c2f1e +8c70bfaa-9614-430f-884f-f20d995fc103 +b0f11f57-7dd6-4770-b8ab-7c48b85880f9 +c2ddc710-ae90-4249-ab47-ef4ecb390ada +381cc150-872d-4da0-a737-e8180dfaefca +b37f0281-b195-4293-ac6d-9593958aa16b diff --git a/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-gsas.py b/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-gsas.py index 513686d..d5071a1 100644 --- a/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-gsas.py +++ b/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-gsas.py @@ -69,6 +69,18 @@ def unpack_run(self, run): @startup_decorator def startup(): agent.start() + path = ( + "/nsls2/data/pdf/shared/config/source/" + "pdf-agents/pdf_agents/startup_scripts/" + "mmm5-tax-day/fri-gsas-out-uids.txt" + ) + with open(path, "r") as f: + uids = [] + for line in f: + uid = line.strip().strip(",").strip("'") + if agent.trigger_condition(uid): + uids.append(uid) + agent.tell_agent_by_uid(uids) @shutdown_decorator diff --git a/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-peakfit.py b/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-peakfit.py index 1e2eab4..65fe2f4 100644 --- a/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-peakfit.py +++ b/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-peakfit.py @@ -64,6 +64,18 @@ def unpack_run(self, run): @startup_decorator def startup(): agent.start() + path = ( + "/nsls2/data/pdf/shared/config/source/" + "pdf-agents/pdf_agents/startup_scripts/" + "mmm5-tax-day/fri-peak-fit-out-uids.txt" + ) + with open(path, "r") as f: + uids = [] + for line in f: + uid = line.strip().strip(",").strip("'") + if agent.trigger_condition(uid): + uids.append(uid) + agent.tell_agent_by_uid(uids) @shutdown_decorator diff --git a/pdf_agents/startup_scripts/mmm5-tax-day/sva-gsas.py b/pdf_agents/startup_scripts/mmm5-tax-day/sva-gsas.py index 67363c1..d70d72a 100644 --- a/pdf_agents/startup_scripts/mmm5-tax-day/sva-gsas.py +++ b/pdf_agents/startup_scripts/mmm5-tax-day/sva-gsas.py @@ -68,6 +68,18 @@ def unpack_run(self, run): @startup_decorator def startup(): agent.start() + path = ( + "/nsls2/data/pdf/shared/config/source/" + "pdf-agents/pdf_agents/startup_scripts/" + "mmm5-tax-day/fri-gsas-out-uids.txt" + ) + with open(path, "r") as f: + uids = [] + for line in f: + uid = line.strip().strip(",").strip("'") + if agent.trigger_condition(uid): + uids.append(uid) + agent.tell_agent_by_uid(uids) @shutdown_decorator diff --git a/pdf_agents/startup_scripts/mmm5-tax-day/sva-peakfit.py b/pdf_agents/startup_scripts/mmm5-tax-day/sva-peakfit.py index 93d2db2..7a01889 100644 --- a/pdf_agents/startup_scripts/mmm5-tax-day/sva-peakfit.py +++ b/pdf_agents/startup_scripts/mmm5-tax-day/sva-peakfit.py @@ -63,6 +63,18 @@ def unpack_run(self, run): @startup_decorator def startup(): agent.start() + path = ( + "/nsls2/data/pdf/shared/config/source/" + "pdf-agents/pdf_agents/startup_scripts/" + "mmm5-tax-day/fri-peak-fit-out-uids.txt" + ) + with open(path, "r") as f: + uids = [] + for line in f: + uid = line.strip().strip(",").strip("'") + if agent.trigger_condition(uid): + uids.append(uid) + agent.tell_agent_by_uid(uids) @shutdown_decorator