Add detailed field of science to many projects (#4940)

* Add detailed field of science to many projects

* Refine remaining projects

* Update script to check for further granularity

---------

Co-authored-by: Cannon Lock <clock@wisc.edu>

Author: fallow64

.github/scripts/check_project_fos_precision/main.py

@@ -9,56 +9,44 @@
 
 def get_active_projects(start_date: datetime.datetime):
     response = requests.get(
-        "https://gracc.opensciencegrid.org/q/gracc.osg.summary/_search",
+        "https://elastic.osg.chtc.io/q/ospool-summary-*/_search",
         json={
-            "size": 0,
-            "query": {
-                "bool": {
-                    "filter": [
-                        {
-                            "term": {
-                                "ResourceType": "Payload"
-                            }
-                        },
-                        {
-                            "range": {
-                                "EndTime": {
-                                    "lte": int(datetime.datetime.now().timestamp() * 1000),
-                                    "gte": int(start_date.timestamp() * 1000)
-                                }
-                            }
-                        }
-                    ]
-                },
-            },
-            "aggs": {
-                "projects": {
-                    "terms": {
-                        "field": "ProjectName",
-                        "size": 99999999
-                    },
-                    "aggs": {
-                        "projectJobsRan": {
-                            "sum": {
-                                "field": "Njobs"
-                            }
-                        }
-                    }
-                }
-            }
-        }
+					"size": 0,
+					"query": {
+						"range": {
+							"Date": {
+								"lte": int(datetime.datetime.now().timestamp() * 1000),
+								"gte": int(start_date.timestamp() * 1000)
+							}
+						}
+					},
+					"aggs": {
+						"bucket": {
+							"terms": {
+								"field": "ProjectName.keyword",
+								"size": 10000
+							},
+							"aggs": {
+								"NumJobs": {
+									"sum": {
+										"field": "NumJobs"
+									}
+								},
+							}
+						}
+					}
+				}
     )
 
     data = response.json()
 
-    active_projects = [x['key'] for x in data['aggregations']['projects']['buckets']]
+    active_projects = [x['key'] for x in data['aggregations']['bucket']['buckets']]
 
     return active_projects
 
 
-
 def has_detailed_precision(id: str):
-    return get_id(id, granularity=1) is not None
+    return get_id(id, granularity=2) is not None
 
 
 def main():

projects/AMNH.astro.yaml

@@ -10,4 +10,4 @@ Sponsor:
   CampusGrid:
     Name: OSG Connect
 InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
-FieldOfScienceID: '40.02'
+FieldOfScienceID: '40.0201' # Astronomy

projects/AMNH_MacLow.yaml

@@ -9,4 +9,4 @@ Sponsor:
   CampusGrid:
     Name: OSG Connect
 InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
-FieldOfScienceID: '40.02'
+FieldOfScienceID: '40.0201' # Astronomy

projects/Arcadia_Curotto.yaml

@@ -10,4 +10,4 @@ Sponsor:
   CampusGrid:
     Name: OSG Connect
 InstitutionID: 'https://osg-htc.org/iid/c6ehbi2dyh8h'
-FieldOfScienceID: '40.05'
+FieldOfScienceID: '40.0501' # Chemistry, General

projects/CMU_Isayev.yaml

@@ -7,4 +7,4 @@ PIName: Olexandr Isayev
 
 
 InstitutionID: 'https://osg-htc.org/iid/3cqqrc2cgibl'
-FieldOfScienceID: '40.05'
+FieldOfScienceID: '40.0511' # Theoretical Chemistry

projects/CSUN_Katz.yaml

@@ -5,4 +5,4 @@ FieldOfScience: Mathematics
 Organization: California State University, Northridge
 PIName: Daniel Katz
 InstitutionID: 'https://osg-htc.org/iid/vfjpi4twqspj'
-FieldOfScienceID: '27.01'
+FieldOfScienceID: '27.0101' # Mathematics, General

projects/Columbia_Mandal.yaml

@@ -16,4 +16,4 @@ Sponsor:
   CampusGrid:
     Name: OSG Connect
 InstitutionID: 'https://osg-htc.org/iid/avy4x5r4jsrw'
-FieldOfScienceID: '40.05'
+FieldOfScienceID: '40.0501' # Chemistry, General

projects/Columbia_Reichman.yaml

@@ -9,4 +9,4 @@ FieldOfScience: Chemistry
 Organization: Columbia University
 PIName: David Reichman
 InstitutionID: 'https://osg-htc.org/iid/avy4x5r4jsrw'
-FieldOfScienceID: '40.05'
+FieldOfScienceID: '40.0501' # Chemistry, General

projects/DUNE.yaml

@@ -8,4 +8,4 @@ Sponsor:
   VirtualOrganization:
     Name: Fermilab
 InstitutionID: 'https://osg-htc.org/iid/ik4s3ql8u1j7'
-FieldOfScienceID: '40.08'
+FieldOfScienceID: '40.0804' # Elementary Particle Physics

projects/Dearborn_Shawver.yaml

@@ -8,4 +8,4 @@ Sponsor:
   CampusGrid:
     Name: OSG Connect
 InstitutionID: "https://osg-htc.org/iid/v8uoprmk1nb2"
-FieldOfScienceID: '11'
+FieldOfScienceID: '11.0101'