Changeset 8381

Timestamp:

10/21/08 16:54:19 (5 years ago)

Author:

hvolos

Message:

added the option for envelope only fading

Location:

ossiedev/branches/hvolos/components/Channel

Files:

• Channel.cpp (modified) (4 diffs)
• Channel.h (modified) (1 diff)
• Channel.prf.xml (modified) (1 diff)

ossiedev/branches/hvolos/components/Channel/Channel.cpp

@@ -38 +38 @@
     K_factor=1;
     MaxDopplerRate=0;
+    envelope=true;
 
     //Create the thread for the writer's processing function 
@@ -136 +137 @@
                throw CF::PropertySet::InvalidConfiguration();
             };
-            
+
+        } else if (strcmp(props[i].id, "DCE:4ba6cb86-29fb-40c8-a90c-7e69b7e59d85") == 0) {
+           const char * prop_str;
+            props[i].value >>= prop_str;
+            if ( strcmp(prop_str, "True") == 0 ) {
+               envelope=true;
+            } else if ( strcmp(prop_str, "False") == 0 ){
+               fading=false;
+            } else {
+              std::cerr << "ERROR: Channel::configure() unknown envelope type" << std::endl;
+               throw CF::PropertySet::InvalidConfiguration();
+            };
 
         } else if (strcmp(props[i].id, "DCE:76abee66-8a83-11dd-b96d-0016769e497b") == 0) {
@@ -158 +170 @@
         }**/
     }
-std::cout<<"noise_sigma:"<<noise_sigma<<"fading:"<<fading<<"K_factor:"<<K_factor<<"MaxDopplerRate"<<MaxDopplerRate<<std::endl;
+std::cout<<"noise_sigma:"<<noise_sigma<<"fading:"<<fading<<"envelope"<<envelope<<"K_factor:"<<K_factor<<"MaxDopplerRate"<<MaxDopplerRate<<std::endl;
 
 }
@@ -227 +239 @@
             pQ/=PathPower;
 
+            if (envelope){
+            pI=sqrt(pI*pI+pQ*pQ);
+            pQ=pI;            
+
+            }
+
             pI=1/sqrt(K_factor+1)*pI +sqrt(K_factor/(1+K_factor));
             pQ=1/sqrt(K_factor+1)*pQ +sqrt(K_factor/(1+K_factor));
+
+
+
             }
             else {

ossiedev/branches/hvolos/components/Channel/Channel.h

@@ -94 +94 @@
 
     bool fading;
+    bool envelope;
 
     double noise_sigma,K_factor,MaxDopplerRate;

ossiedev/branches/hvolos/components/Channel/Channel.prf.xml

@@ -12 +12 @@
         <value>Ricean</value> 
         <description>Specifies the fading type. Valid values are "None" and "Ricean"</description> 
+        <kind kindtype="configure"/>
+    </simple>
+    <simple id="DCE:4ba6cb86-29fb-40c8-a90c-7e69b7e59d85" mode="readonly" name="Envelope Fading Only" type="string">
+        <value>True</value> 
+        <description>If set to "True" fading doesn't affect the phase of the signal. Valid values "True" and "False"</description> 
         <kind kindtype="configure"/>
     </simple>