--- a/src/lte/examples/lena-profiling.cc	Fri Jan 27 17:52:58 2012 +0100
+++ b/src/lte/examples/lena-profiling.cc	Mon Jan 30 11:48:29 2012 +0100
@@ -108,7 +108,7 @@
               Vector v (roomLength * (column + 0.5), roomLength * (row + 0.5), nodeHeight);
               positionAlloc->Add (v);
               enbPosition.push_back (v);
-              mobility.Install (ueNodes[plantedEnb]);
+              mobility.Install (ueNodes.at(plantedEnb));
             }
         }
       mobility.SetPositionAllocator (positionAlloc);
@@ -117,17 +117,17 @@
       // Position of UEs attached to eNB
       for (uint32_t i = 0; i < nEnb; i++)
         {
-          UniformVariable posX (enbPosition[i].x - roomLength * 0.5,
-                                enbPosition[i].x + roomLength * 0.5);
-          UniformVariable posY (enbPosition[i].y - roomLength * 0.5,
-                                enbPosition[i].y + roomLength * 0.5);
+          UniformVariable posX (enbPosition.at(i).x - roomLength * 0.5,
+                                enbPosition.at(i).x + roomLength * 0.5);
+          UniformVariable posY (enbPosition.at(i).y - roomLength * 0.5,
+                                enbPosition.at(i).y + roomLength * 0.5);
           positionAlloc = CreateObject<ListPositionAllocator> ();
           for (uint32_t j = 0; j < nUe; j++)
             {
               positionAlloc->Add (Vector (posX.GetValue (), posY.GetValue (), nodeHeight));
               mobility.SetPositionAllocator (positionAlloc);
             }
-          mobility.Install (ueNodes[i]);
+          mobility.Install (ueNodes.at(i));
         }
 
     }
@@ -164,10 +164,10 @@
                   mmEnb->SetRoomNumberY (column);
 
                   // Positioning UEs attached to eNB
-                  mobility.Install (ueNodes[plantedEnb]);
+                  mobility.Install (ueNodes.at(plantedEnb));
                   for (uint32_t ue = 0; ue < nUe; ue++)
                     {
-                      Ptr<BuildingsMobilityModel> mmUe = ueNodes[plantedEnb].Get (ue)->GetObject<BuildingsMobilityModel> ();
+                      Ptr<BuildingsMobilityModel> mmUe = ueNodes.at(plantedEnb).Get (ue)->GetObject<BuildingsMobilityModel> ();
                       Vector vUe (v.x, v.y, v.z);
                       mmUe->SetPosition (vUe);
                       mmUe->SetIndoor (building);
@@ -191,7 +191,7 @@
   enbDevs = lteHelper->InstallEnbDevice (enbNodes);
   for (uint32_t i = 0; i < nEnb; i++)
     {
-      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes[i]);
+      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at(i));
       ueDevs.push_back (ueDev);
       lteHelper->Attach (ueDev, enbDevs.Get (i));
       enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;

--- a/src/lte/examples/lena-rem-sector-antenna.cc	Fri Jan 27 17:52:58 2012 +0100
+++ b/src/lte/examples/lena-rem-sector-antenna.cc	Mon Jan 30 11:48:29 2012 +0100
@@ -47,8 +47,6 @@
 
   cmd.Parse (argc, argv);
 
-  Config::SetDefault ("ns3::LteSpectrumPhy::PemEnabled", BooleanValue (false));
-
   // Geometry of the scenario (in meters)
   // Assume squared building
   double nodeHeight = 1.5;
@@ -61,7 +59,7 @@
 
   Ptr < LteHelper > lteHelper = CreateObject<LteHelper> ();
   //lteHelper->EnableLogComponents ();
-  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel"));
+  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
@@ -114,10 +112,10 @@
           mmEnb->SetRoomNumberY (column);
 
           // Positioning UEs attached to eNB
-          mobility.Install (ueNodes.at (plantedEnb));
+          mobility.Install (ueNodes.at(plantedEnb));
           for (uint32_t ue = 0; ue < nUe; ue++)
             {
-              Ptr<BuildingsMobilityModel> mmUe = ueNodes.at (plantedEnb).Get (ue)->GetObject<BuildingsMobilityModel> ();
+              Ptr<BuildingsMobilityModel> mmUe = ueNodes.at(plantedEnb).Get (ue)->GetObject<BuildingsMobilityModel> ();
               Vector vUe (v.x, v.y, v.z);
               mmUe->SetPosition (vUe);
               mmUe->SetIndoor (building);
@@ -132,7 +130,7 @@
   Vector v (500, 3000, nodeHeight);
   positionAlloc->Add (v);
   enbPosition.push_back (v);
-  mobility.Install (ueNodes.at (plantedEnb));
+  mobility.Install (ueNodes.at(plantedEnb));
   plantedEnb++;
 
   // Add the 3-sector site
@@ -141,7 +139,7 @@
       Vector v (500, 2000, nodeHeight);
       positionAlloc->Add (v);
       enbPosition.push_back (v);
-      mobility.Install (ueNodes.at (plantedEnb));
+      mobility.Install (ueNodes.at(plantedEnb));
     }
 
 
@@ -151,24 +149,24 @@
   // Position of UEs attached to eNB
   for (uint32_t i = 0; i < nEnb; i++)
     {
-      UniformVariable posX (enbPosition.at (i).x - roomLength * 0,
-                            enbPosition.at (i).x + roomLength * 0);
-      UniformVariable posY (enbPosition.at (i).y - roomLength * 0,
-                            enbPosition.at (i).y + roomLength * 0);
+      UniformVariable posX (enbPosition.at(i).x - roomLength * 0,
+                            enbPosition.at(i).x + roomLength * 0);
+      UniformVariable posY (enbPosition.at(i).y - roomLength * 0,
+                            enbPosition.at(i).y + roomLength * 0);
       positionAlloc = CreateObject<ListPositionAllocator> ();
       for (uint32_t j = 0; j < nUe; j++)
         {
           if ( i == nEnb - 3 )
             {
-              positionAlloc->Add (Vector (enbPosition.at (i).x + 10, enbPosition.at (i).y, nodeHeight));
+              positionAlloc->Add (Vector (enbPosition.at(i).x + 10, enbPosition.at(i).y, nodeHeight));
             }
           else if ( i == nEnb - 2 )
             {
-              positionAlloc->Add (Vector (enbPosition.at (i).x - sqrt (10), enbPosition.at (i).y + sqrt (10), nodeHeight));
+              positionAlloc->Add (Vector (enbPosition.at(i).x - sqrt (10), enbPosition.at(i).y + sqrt (10), nodeHeight));
             }
           else if ( i == nEnb - 1 )
             {
-              positionAlloc->Add (Vector (enbPosition.at (i).x - sqrt (10), enbPosition.at (i).y - sqrt (10), nodeHeight));
+              positionAlloc->Add (Vector (enbPosition.at(i).x - sqrt (10), enbPosition.at(i).y - sqrt (10), nodeHeight));
             }
           else
             {
@@ -176,7 +174,7 @@
             }
           mobility.SetPositionAllocator (positionAlloc);
         }
-      mobility.Install (ueNodes.at (i));
+      mobility.Install (ueNodes.at(i));
     }
   BuildingsHelper::MakeMobilityModelConsistent ();
 
@@ -208,7 +206,7 @@
 
   for (uint32_t i = 0; i < nEnb; i++)
     {
-      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at (i));
+      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at(i));
       ueDevs.push_back (ueDev);
       lteHelper->Attach (ueDev, enbDevs.Get (i));
       enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
@@ -217,19 +215,17 @@
     }
 
   Simulator::Stop (Seconds (simTime));
-
-  // better to leave traces disabled
-  //lteHelper->EnableTraces ();
+  lteHelper->EnableTraces ();
 
   Ptr<RadioEnvironmentMapHelper> remHelper = CreateObject<RadioEnvironmentMapHelper> ();
   remHelper->SetAttribute ("ChannelPath", StringValue ("/ChannelList/0"));
   remHelper->SetAttribute ("OutputFile", StringValue ("rem.out"));
-  remHelper->SetAttribute ("XMin", DoubleValue (-200.0));
-  remHelper->SetAttribute ("XMax", DoubleValue (1200.0));
-  remHelper->SetAttribute ("XRes", UintegerValue (300));
-  remHelper->SetAttribute ("YMin", DoubleValue (-300.0));
+  remHelper->SetAttribute ("XMin", DoubleValue (-2000.0));
+  remHelper->SetAttribute ("XMax", DoubleValue (+2000.0));
+  remHelper->SetAttribute ("XRes", UintegerValue (100));
+  remHelper->SetAttribute ("YMin", DoubleValue (-500.0));
   remHelper->SetAttribute ("YMax", DoubleValue (+3500.0));
-  remHelper->SetAttribute ("YRes", UintegerValue (300));
+  remHelper->SetAttribute ("YRes", UintegerValue (100));
   remHelper->SetAttribute ("Z", DoubleValue (1.5));
   remHelper->Install ();
   // Recall the buildings helper to place the REM nodes in its position