From ad1ff19301a1e8e3cd1b4d03ad3d70f041ed3a6d Mon Sep 17 00:00:00 2001
From: Alex Rojas <a.rojas8907@gmail.com>
Date: Sat, 14 Sep 2024 19:32:45 -0700
Subject: [PATCH] edited the output vals to include more rh vals.

---
 .ipynb_checkpoints/build-env-checkpoint.sh |   9 ++-------
 .ipynb_checkpoints/main-checkpoint.py      |  13 ++++++++++++-
 .ipynb_checkpoints/run-checkpoint.sh       |   3 ++-
 __pycache__/get_gedi_data.cpython-310.pyc  | Bin 0 -> 1234 bytes
 __pycache__/pgap.cpython-310.pyc           | Bin 0 -> 7095 bytes
 build-env.sh                               |   2 +-
 main.py                                    |  13 ++++++++++++-
 run.sh                                     |   3 ++-
 8 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 __pycache__/get_gedi_data.cpython-310.pyc
 create mode 100644 __pycache__/pgap.cpython-310.pyc

diff --git a/.ipynb_checkpoints/build-env-checkpoint.sh b/.ipynb_checkpoints/build-env-checkpoint.sh
index 802ebb2..81d333c 100644
--- a/.ipynb_checkpoints/build-env-checkpoint.sh
+++ b/.ipynb_checkpoints/build-env-checkpoint.sh
@@ -3,17 +3,12 @@
 # source activate base
 basedir=$( cd "$(dirname "$0")" ; pwd -P)
 echo installing environment...
-mamba env create --name osgeo-env -f ${basedir}/environment.yml
-# conda create --name osgeo-env --clone base
-# source activate osgeo-env
-# mamba install -c conda-forge scipy -y
-# mamba install -c conda-forge h5py -y
-# mamba install -c conda-forge geopandas -y
+conda env create --name osgeo-env -f ${basedir}/environment.yml
 
 # Install the maap.py environment
 echo trying to install maap-py...
 source activate osgeo-env
-git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git
+git clone --single-branch --branch v4.1.0 https://github.com/MAAP-Project/maap-py.git
 cd maap-py
 pip install -e .
 echo installed maap-py package!
diff --git a/.ipynb_checkpoints/main-checkpoint.py b/.ipynb_checkpoints/main-checkpoint.py
index 802d7c7..c416625 100644
--- a/.ipynb_checkpoints/main-checkpoint.py
+++ b/.ipynb_checkpoints/main-checkpoint.py
@@ -186,8 +186,19 @@ if __name__ == '__main__':
         biFP_list = []
         gap_list = []
         lai_list = []
-        rh_list = []
         cval_list = []
+        rh98_list = []
+        rh95_list = []
+        rh90_list = []
+        rh85_list = []
+        rh80_list = []
+        rh75_list = []
+        rh70_list = []
+        rh65_list = []
+        rh60_list = []
+        rh55_list = []
+        rh50_list = []
+        
         print("Running pgap iteratively...")
         for i in idx:
             results = gedi_bioindex(i)
diff --git a/.ipynb_checkpoints/run-checkpoint.sh b/.ipynb_checkpoints/run-checkpoint.sh
index 047fbb5..d6d50b9 100644
--- a/.ipynb_checkpoints/run-checkpoint.sh
+++ b/.ipynb_checkpoints/run-checkpoint.sh
@@ -5,6 +5,7 @@ basedir=$( cd "$(dirname "$0")" ; pwd -P)
 
 # Activate environment that was created in the builed-env.sh file
 source activate osgeo-env
+# source activate /projects/env/osgeo-env
 
 # Create output dir
 # OUTPUTDIR="${PWD}/output"
@@ -14,4 +15,4 @@ L1B_URL=$1
 L2A_URL=$2 # e.g. GEDI01_B or GEDI02_A
 # YR=$3
 # python ${basedir}/main.py ${L1B_URL} ${L2A_URL} ${OUTPUTDIR}
-python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output
+python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output
\ No newline at end of file
diff --git a/__pycache__/get_gedi_data.cpython-310.pyc b/__pycache__/get_gedi_data.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..978c71c87edf4e10ef04cc5847400445e803ea82
GIT binary patch
literal 1234
zcmY*YTZ<e;6s}ue=9XYI?k@NsK8W+M)0iQMB9cWBye)!)SRg}BSMAPBdZs#cYFu`h
zc}iY`KOhJ*kNPA0A@!&r>|Y4Nda65{OsY8NRDE^2&)xKTZG!9XcmF;6ixcusxa=>)
z$O9x8BU41tlE_9<N$We4td?BzS_&y@8OaDGE8}@06H0WVxDrpPOzYQ{Y^g}aPl#-*
zM5QP@ivB?Qtt+%cPW#l0?@ms>U%i!A)4@E?tK-U=nJ(PG*z-P>t$>Xt23$eI7cUk=
znIL_R1ox1w$rhd7(G68>O%*>P&+v{XaYVLMMLYWH{*3${qYLrrbDFIVVE9Rvm9<?J
zj5{>0RdyxtuU9d$6(3CQ_nD8NDyI&Gv(pOid}&LJZfZw`nOE=!u`Seo{%!Um0?5Ww
zGtc3rJU-WIdR&;r5;CyG&GSBduH7hTja2UPL3Qa5%1Y&V(SQ@@Di}F4f?*F$L2$86
zKcKdQhu89xA`qy~&!2d3WJb5F$&lkSag(JcL&&2eqT;7w!(23rx5=7dF1bq99J9qX
z!lm2Rnr+*zvnG$JN_R}Pc5D;XxKQmK`|a)~UPs&Rj(kCWNjC|ed+TH!?-(VIKKcop
zN#K6WDOsc+68QRpQWEyhNT_>j7o@<tbWT?v*O6jf>NGSd80g%(NdSt{EY)C<Lq0e+
zzh*EjtX6vArg;gT!BBScqR;@}=*zE^ybT)P-N_9kyMS*~v-r_G)Qdj%{Gq;-aiirU
z7tmE=maba5%riUo)Ovc+zwJfnMalCEkcTgw!CH*=?Z;;Tl`eeyY+7o#1gGbo8StXY
z-NdKk9P}ceYcD4EvAp6-)bheqdQlhA3v>pR3xkgl1`4{L+E7W~*|TE1h}eSwN9gHU
zC6lIWz;gx8b2FaR-Po`&`o8yCZ@qyKypJrVjEZX^7>%3#UpH>kLwbvLk=XS+*C`j&
zzK5#)uICt$J;bw&#>SZ;285z8R@*lNnp*v6slh=rxb;NaFs$}YV0Qxx&07C&&%-b|
dwstf9bZ*qL)SrcMhqsZX^wsXtcDV7b_#Y=|M2i3b

literal 0
HcmV?d00001

diff --git a/__pycache__/pgap.cpython-310.pyc b/__pycache__/pgap.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0d0df8c0667b87e1a104de112cb7196ee28f0ca6
GIT binary patch
literal 7095
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

literal 0
HcmV?d00001

diff --git a/build-env.sh b/build-env.sh
index 56bface..81d333c 100644
--- a/build-env.sh
+++ b/build-env.sh
@@ -8,7 +8,7 @@ conda env create --name osgeo-env -f ${basedir}/environment.yml
 # Install the maap.py environment
 echo trying to install maap-py...
 source activate osgeo-env
-git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git
+git clone --single-branch --branch v4.1.0 https://github.com/MAAP-Project/maap-py.git
 cd maap-py
 pip install -e .
 echo installed maap-py package!
diff --git a/main.py b/main.py
index 802d7c7..c416625 100644
--- a/main.py
+++ b/main.py
@@ -186,8 +186,19 @@ if __name__ == '__main__':
         biFP_list = []
         gap_list = []
         lai_list = []
-        rh_list = []
         cval_list = []
+        rh98_list = []
+        rh95_list = []
+        rh90_list = []
+        rh85_list = []
+        rh80_list = []
+        rh75_list = []
+        rh70_list = []
+        rh65_list = []
+        rh60_list = []
+        rh55_list = []
+        rh50_list = []
+        
         print("Running pgap iteratively...")
         for i in idx:
             results = gedi_bioindex(i)
diff --git a/run.sh b/run.sh
index 047fbb5..d6d50b9 100644
--- a/run.sh
+++ b/run.sh
@@ -5,6 +5,7 @@ basedir=$( cd "$(dirname "$0")" ; pwd -P)
 
 # Activate environment that was created in the builed-env.sh file
 source activate osgeo-env
+# source activate /projects/env/osgeo-env
 
 # Create output dir
 # OUTPUTDIR="${PWD}/output"
@@ -14,4 +15,4 @@ L1B_URL=$1
 L2A_URL=$2 # e.g. GEDI01_B or GEDI02_A
 # YR=$3
 # python ${basedir}/main.py ${L1B_URL} ${L2A_URL} ${OUTPUTDIR}
-python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output
+python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output
\ No newline at end of file
-- 
GitLab