Merge remote-tracking branch 'origin/add_chansimuparams' into develop_integration_2020_w31

executables/nr-uesoftmodem.c

@@ -78,6 +78,9 @@ unsigned short config_frames[4] = {2,9,11,13};
 
 /* Callbacks, globals and object handlers */
 
+//#include "stats.h"
+// current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
+#include "PHY/TOOLS/phy_scope_interface.h"
 #include "PHY/TOOLS/nr_phy_scope.h"
 #include <executables/nr-uesoftmodem.h>
 #include "executables/softmodem-common.h"
@@ -148,14 +151,11 @@ char ref[128] = "internal";
 char channels[128] = "0";
 
 
-static char *parallel_config = NULL;
-static char *worker_config = NULL;
-
 int rx_input_level_dBm;
 
 //static int online_log_messages=0;
 
-uint32_t do_forms=0;
+
 int otg_enabled;
 //int number_of_cards = 1;
 
@@ -758,8 +758,10 @@ int main( int argc, char **argv ) {
   memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
   configure_linux();
   mlockall(MCL_CURRENT | MCL_FUTURE);
-  if (do_forms)
-     nrUEinitScope(PHY_vars_UE_g[0][0]);
+ 
+  if(IS_SOFTMODEM_DOFORMS) { 
+    load_softscope("nr",PHY_vars_UE_g[0][0]);
+  }     
   number_of_cards = 1;
 
   for(int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {