diff --git a/openair1/SIMULATION/LTE_MUMIMO/COPYING b/openair1/SIMULATION/LTE_MUMIMO/COPYING
deleted file mode 100644
index 818433ecc0e094a4db1023c68b33f24344643ad8..0000000000000000000000000000000000000000
--- a/openair1/SIMULATION/LTE_MUMIMO/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/openair1/SIMULATION/LTE_MUMIMO/Makefile b/openair1/SIMULATION/LTE_MUMIMO/Makefile
deleted file mode 100644
index 5630fa16d249fc978ef5040d494828dec58a9110..0000000000000000000000000000000000000000
--- a/openair1/SIMULATION/LTE_MUMIMO/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-include $(OPENAIR_HOME)/common/utils/Makefile.inc
-
-TOP_DIR = ../..
-
-
-CFLAGS += -m32 -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1
-
-CFLAGS += -DOPENAIR_LTE -DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE
-CFLAGS += -DTBS_FIX
-CFLAGS += -DCELLULAR
-
-ifdef EMOS
-CFLAGS += -DEMOS
-endif
-
-ifdef DEBUG_PHY
-CFLAGS += -DDEBUG_PHY
-endif
-
-ifdef OPENAIR2
-CFLAGS += -DOPENAIR2 
-endif
-
-CFLAGS += -I$(OPENAIR2_DIR) -I$(OPENAIR3_DIR)/MESH -I$(OPENAIR2_DIR)/COMMON -I$(OPENAIR2_DIR)/LAYER2/RLC -I$(OPENAIR2_DIR)/UTIL/MEM -I$(OPENAIR2_DIR)/UTIL/MATH -I$(OPENAIR2_DIR)/UTIL/LISTS -I$(OPENAIR2_DIR)/LAYER2/RLC/AM -I$(OPENAIR2_DIR)/LAYER2/RLC/UM_v6.1.0_LITE -I$(OPENAIR2_DIR)/LAYER2/RLC/TM -I$(OPENAIR2_DIR)/UTIL/TIMER -I/usr/include/X11 -I/usr/X11R6/include
-
-include $(TOP_DIR)/PHY/Makefile.inc
-include $(TOP_DIR)/SCHED/Makefile.inc
-
-SIMULATION_OBJS  = $(TOP_DIR)/SIMULATION/TOOLS/gauss.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/random_channel.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/rangen_double.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/taus.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/multipath_channel.o
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/rf.o
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/adc.o
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/dac.o
-
-#STATS_OBJS += $(TOP_DIR)/ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_proc.o
-
-LAYER2_OBJ += $(OPENAIR2_DIR)/LAYER2/MAC/rar_tools.o
-
-OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS) $(SCHED_OBJS) $(STATS_OBJS) $(LAYER2_OBJ)	
-OBJ2 = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS) $(TOP_DIR)/SCHED/phy_procedures_lte_common.o $(TOP_DIR)/SCHED/phy_procedures_lte_ue.o
-
-all: dlsim dlsim2 ulsim ulsim2 physim physim_secsys
-
-test: $(SIMULATION_OBJS) $(TOOLS_OBJS) $(TOP_DIR)/PHY/INIT/lte_init.o test.c
-	$(CC)  test.c -I$(TOP_DIR) -o test $(CFLAGS) $(SIMULATION_OBJS) $(TOOLS_OBJS) -lm 
-
-%.o : %.c
-	$(CC) -c $(CFLAGS) -I$(TOP_DIR) -o $@ $<
-
-dlsim : $(OBJ2) dlsim.c
-	$(CC) dlsim.c -I$(TOP_DIR) -o dlsim $(CFLAGS) $(OBJ2) -lm -lblas
-
-dlsim2 : $(OBJ2) dlsim2.c
-	$(CC) dlsim2.c -I$(TOP_DIR) -o dlsim2 $(CFLAGS) $(OBJ2) -lm -lblas
-
-ulsim : $(OBJ2) ulsim.c ulsim_form.c
-	$(CC) ulsim.c ulsim_form.c -I$(TOP_DIR) -o ulsim $(CFLAGS) $(OBJ2) -lm -lforms -L/usr/local/lib -lforms -lX11 -L/usr/X11R6/lib -lXpm
-
-ulsim2 : $(OBJ2) ulsim2.c
-	$(CC) ulsim2.c -I$(TOP_DIR) -o ulsim2 $(CFLAGS) $(OBJ2) -lm
-
-physim : $(OBJ) phy_procedures_sim.c 
-	$(CC)  phy_procedures_sim.c -I$(TOP_DIR) -o physim $(CFLAGS) $(OBJ) -lm
-
-clean:
-	rm -f dlsim dlsim2 ulsim ulsim2 physim
-	rm -f $(OBJ)
-	rm -f *.o
-	rm -f *.exe*
-
-showcflags:
-	@echo $(CFLAGS)
-
diff --git a/openair1/SIMULATION/LTE_MUMIMO/dlsim.c b/openair1/SIMULATION/LTE_MUMIMO/dlsim.c
deleted file mode 100644
index 920ef6bddc951f45522f502df8cfaacb18d6d7a4..0000000000000000000000000000000000000000
--- a/openair1/SIMULATION/LTE_MUMIMO/dlsim.c
+++ /dev/null
@@ -1,1054 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-#include <string.h>
-#include <math.h>
-#include <unistd.h>
-#include "SIMULATION/TOOLS/defs.h"
-#include "PHY/types.h"
-#include "PHY/defs.h"
-#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
-#ifdef IFFT_FPGA
-#include "PHY/LTE_REFSIG/mod_table.h"
-#endif
-
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/vars.h"
-#include "SCHED/defs.h"
-#include "SCHED/vars.h"
-
-//#define AWGN
-#define NO_DCI
-
-#define BW 7.68
-#define Td 1.0
-
-//#define OUTPUT_DEBUG 1
-
-#define RBmask0 0x00fc00fc
-#define RBmask1 0x0
-#define RBmask2 0x0
-#define RBmask3 0x0
-
-unsigned char dlsch_cqi;
-
-PHY_VARS_eNB *PHY_vars_eNb;
-PHY_VARS_UE *PHY_vars_UE;
-
-
-void lte_param_init(unsigned char N_tx, unsigned char N_rx,unsigned char transmission_mode)
-{
-
-  unsigned int ind;
-
-  printf("Start lte_param_init\n");
-  PHY_vars_eNb = malloc(sizeof(PHY_VARS_eNB));
-  PHY_vars_UE = malloc(sizeof(PHY_VARS_UE));
-  PHY_config = malloc(sizeof(PHY_CONFIG));
-  mac_xface = malloc(sizeof(MAC_xface));
-
-  randominit(0);
-  set_taus_seed(0);
-
-  lte_frame_parms = &(PHY_vars_eNb->lte_frame_parms);
-
-  lte_frame_parms->N_RB_DL            = 25;   //50 for 10MHz and 25 for 5 MHz
-  lte_frame_parms->N_RB_UL            = 25;
-  lte_frame_parms->Ncp                = 1;
-  lte_frame_parms->Nid_cell           = 0;
-  lte_frame_parms->nushift            = 0;
-  lte_frame_parms->nb_antennas_tx     = N_tx;
-  lte_frame_parms->nb_antennas_rx     = N_rx;
-  lte_frame_parms->first_dlsch_symbol = 4;
-  lte_frame_parms->num_dlsch_symbols  = 6;
-  lte_frame_parms->Csrs = 2;
-  lte_frame_parms->Bsrs = 0;
-  lte_frame_parms->kTC = 0;
-  lte_frame_parms->n_RRC = 0;
-  lte_frame_parms->mode1_flag = (transmission_mode == 1)? 1 : 0;
-
-  init_frame_parms(lte_frame_parms);
-
-  copy_lte_parms_to_phy_framing(lte_frame_parms, &(PHY_config->PHY_framing));
-
-  phy_init_top(N_tx); //allocation
-
-  lte_frame_parms->twiddle_fft      = twiddle_fft;
-  lte_frame_parms->twiddle_ifft     = twiddle_ifft;
-  lte_frame_parms->rev              = rev;
-
-  PHY_vars_UE->lte_frame_parms = *lte_frame_parms;
-
-  lte_gold(lte_frame_parms);
-  generate_ul_ref_sigs();
-  generate_ul_ref_sigs_rx();
-  generate_64qam_table();
-  generate_16qam_table();
-  generate_RIV_tables();
-
-  generate_pcfich_reg_mapping(lte_frame_parms);
-  generate_phich_reg_mapping_ext(lte_frame_parms);
-
-  phy_init_lte_ue(&PHY_vars_UE->lte_frame_parms,
-                  &PHY_vars_UE->lte_ue_common_vars,
-                  PHY_vars_UE->lte_ue_dlsch_vars,
-                  PHY_vars_UE->lte_ue_dlsch_vars_cntl,
-                  PHY_vars_UE->lte_ue_dlsch_vars_ra,
-                  PHY_vars_UE->lte_ue_dlsch_vars_1A,
-                  PHY_vars_UE->lte_ue_pbch_vars,
-                  PHY_vars_UE->lte_ue_pdcch_vars,
-                  PHY_vars_UE);
-
-  phy_init_lte_eNB(&PHY_vars_eNb->lte_frame_parms,
-                   &PHY_vars_eNb->lte_eNB_common_vars,
-                   PHY_vars_eNb->lte_eNB_ulsch_vars,
-                   0,
-                   PHY_vars_eNb);
-
-
-  printf("Done lte_param_init\n");
-
-
-}
-
-DCI0_5MHz_TDD0_t          UL_alloc_pdu;
-DCI1A_5MHz_TDD_1_6_t      CCCH_alloc_pdu;
-DCI2_5MHz_2A_L10PRB_TDD_t DLSCH_alloc_pdu1;
-DCI2_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2;
-
-#define UL_RB_ALLOC 0x1ff;
-#define CCCH_RB_ALLOC computeRIV(lte_frame_parms->N_RB_UL,0,2)
-#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
-//#define DLSCH_RB_ALLOC 0x1f0f // igore DC component,RB13
-
-
-int main(int argc, char **argv)
-{
-
-  char c;
-  int i,aa,s,ind,Kr,Kr_bytes;;
-  double sigma2, sigma2_dB=10,SNR,snr0=-2.0,snr1,SNRmeas;
-  //int **txdataF, **txdata;
-  int **txdata;
-#ifdef IFFT_FPGA
-  int **txdataF2;
-#endif
-  //LTE_DL_FRAME_PARMS *frame_parms = (LTE_DL_FRAME_PARMS *)malloc(sizeof(LTE_DL_FRAME_PARMS));
-  //LTE_UE_COMMON      *lte_ue_common_vars = (LTE_UE_COMMON *)malloc(sizeof(LTE_UE_COMMON));
-  double **s_re,**s_im,**r_re,**r_im;
-  double amps[8] = {0.3868472 , 0.3094778 , 0.1547389 , 0.0773694 , 0.0386847 , 0.0193424 , 0.0096712 , 0.0038685};
-  double aoa=.03,ricean_factor=1; //0.0000005;
-  int channel_length;
-  struct complex **ch;
-
-  int eNb_id = 0, eNb_id_i = 1;
-  unsigned char mcs,dual_stream_UE = 0;
-  unsigned short NB_RB=conv_nprb(0,DLSCH_RB_ALLOC);
-  unsigned char Ns,l,m;
-
-
-  unsigned char *input_data,*decoded_output;
-
-  unsigned char *input_buffer;
-  unsigned short input_buffer_length;
-  unsigned int ret;
-  unsigned int coded_bits_per_codeword,nsymb,dci_cnt;
-
-  unsigned int tx_lev,tx_lev_dB,trials,errs=0,dci_errors=0,dlsch_active=0,num_layers;
-  int re_allocated;
-  FILE *bler_fd;
-  FILE *csv_fd;
-  char bler_fname[20];
-  char csv_fname[20];
-
-  unsigned char pbch_pdu[6];
-
-  DCI_ALLOC_t dci_alloc[8],dci_alloc_rx[8];
-
-  FILE *rx_frame_file;
-  int result;
-
-  int n_frames;
-  int cnt=0;
-  int rx_lev_data_sym;
-  int rx_lev_null_sym;
-  int rx_snr_dB;
-  void *data;
-  int ii;
-  int bler;
-  double blerr;
-  int ch_realization;
-  channel_length = (int) 11+2*BW*Td;
-
-  lte_param_init(1,1,1);
-
-  num_layers = 1;
-  //int cont=0;
-  // default parameters
-  //for (cont =0;cont<29;cont++){
-
-  mcs = 0;
-  n_frames = 1000;
-  snr0 = 2;
-
-  //if(snr0>0)
-  // snr0 = 0;
-  while ((c = getopt (argc, argv, "hm:n:s:")) != -1) {
-    switch (c) {
-    case 'h':
-      printf("%s -h(elp) -m mcs -n n_frames -s snr0\n",argv[0]);
-      exit(1);
-
-    case 'm':
-      mcs = atoi(optarg);
-      break;
-
-    case 'n':
-      n_frames = atoi(optarg);
-      break;
-
-    case 's':
-      snr0 = atoi(optarg);
-      break;
-
-    default:
-      printf("%s -h(elp) -m mcs -n n_frames -s snr0\n",argv[0]);
-      exit (-1);
-      break;
-    }
-  }
-
-  printf("Setting mcs = %d\n",mcs);
-  printf("NPRB = %d\n",NB_RB);
-  printf("n_frames = %d\n",n_frames);
-
-  /*
-      snr0 = -7 + mcs;
-      if(snr0>0)
-      snr0 = ;
-  */
-
-  snr1 = snr0+20;
-  printf("SNR0 %f, SNR1 %f\n",snr0,snr1);
-
-  /*
-    txdataF    = (int **)malloc16(2*sizeof(int*));
-    txdataF[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
-    txdataF[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-
-    txdata    = (int **)malloc16(2*sizeof(int*));
-    txdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
-    txdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-  */
-
-
-#ifdef IFFT_FPGA
-  txdata    = (int **)malloc16(2*sizeof(int*));
-  txdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
-  txdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-
-  bzero(txdata[0],FRAME_LENGTH_BYTES);
-  bzero(txdata[1],FRAME_LENGTH_BYTES);
-
-  txdataF2    = (int **)malloc16(2*sizeof(int*));
-  txdataF2[0] = (int *)malloc16(FRAME_LENGTH_BYTES_NO_PREFIX);
-  txdataF2[1] = (int *)malloc16(FRAME_LENGTH_BYTES_NO_PREFIX);
-
-  bzero(txdataF2[0],FRAME_LENGTH_BYTES_NO_PREFIX);
-  bzero(txdataF2[1],FRAME_LENGTH_BYTES_NO_PREFIX);
-#else
-  txdata = PHY_vars_eNb->lte_eNB_common_vars.txdata[eNb_id];
-#endif
-
-
-  s_re = malloc(2*sizeof(double*));
-  s_im = malloc(2*sizeof(double*));
-  r_re = malloc(2*sizeof(double*));
-  r_im = malloc(2*sizeof(double*));
-
-  nsymb = (lte_frame_parms->Ncp == 0) ? 14 : 12;
-
-  coded_bits_per_codeword = NB_RB * (12 * get_Qm(mcs)) * (lte_frame_parms->num_dlsch_symbols);
-  printf("Rate = %f (mod %d)\n",(((double)dlsch_tbs25[get_I_TBS(mcs)][NB_RB-1])*3/4)/coded_bits_per_codeword,
-         get_Qm(mcs));
-  sprintf(bler_fname,"bler_%d.m",mcs);
-  bler_fd = fopen(bler_fname,"w");
-  fprintf(bler_fd,"bler = [");
-  // CSV file
-  sprintf(csv_fname,"data_out%d.m",mcs);
-  csv_fd = fopen(csv_fname,"w");
-  fprintf(csv_fd,"data_all=[");
-
-  for (i=0; i<2; i++) {
-    s_re[i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-    s_im[i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-    r_re[i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-    r_im[i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-  }
-
-
-  PHY_vars_UE->lte_ue_pdcch_vars[0]->crnti = 0x1234;
-
-  // Fill in UL_alloc
-  UL_alloc_pdu.type    = 0;
-  UL_alloc_pdu.hopping = 0;
-  UL_alloc_pdu.rballoc = UL_RB_ALLOC;
-  UL_alloc_pdu.mcs     = 1;
-  UL_alloc_pdu.ndi     = 1;
-  UL_alloc_pdu.TPC     = 0;
-  UL_alloc_pdu.cqi_req = 1;
-
-  CCCH_alloc_pdu.type               = 0;
-  CCCH_alloc_pdu.vrb_type           = 0;
-  CCCH_alloc_pdu.rballoc            = CCCH_RB_ALLOC;
-  CCCH_alloc_pdu.ndi      = 1;
-  CCCH_alloc_pdu.mcs      = 1;
-  CCCH_alloc_pdu.harq_pid = 0;
-
-  DLSCH_alloc_pdu2.rah              = 0;
-  DLSCH_alloc_pdu2.rballoc          = DLSCH_RB_ALLOC;
-  DLSCH_alloc_pdu2.TPC              = 0;
-  DLSCH_alloc_pdu2.dai              = 0;
-  DLSCH_alloc_pdu2.harq_pid         = 0;
-  DLSCH_alloc_pdu2.tb_swap          = 0;
-  DLSCH_alloc_pdu2.mcs1             = mcs;
-  DLSCH_alloc_pdu2.ndi1             = 1;
-  DLSCH_alloc_pdu2.rv1              = 0;
-  // Forget second codeword
-  DLSCH_alloc_pdu2.tpmi             = 5 ;  // precoding
-
-  // Create transport channel structures for SI pdus
-  PHY_vars_eNb->dlsch_eNb_cntl = new_eNb_dlsch(1,1);
-  PHY_vars_UE->dlsch_ue_cntl  = new_ue_dlsch(1,1);
-
-
-  // Create transport channel structures for 2 transport blocks (MIMO)
-  PHY_vars_eNb->dlsch_eNb = (LTE_eNb_DLSCH_t**) malloc16(2*sizeof(LTE_eNb_DLSCH_t*));
-  PHY_vars_UE->dlsch_ue = (LTE_UE_DLSCH_t**) malloc16(2*sizeof(LTE_UE_DLSCH_t*));
-
-  for (i=0; i<2; i++) {
-    PHY_vars_eNb->dlsch_eNb[i] = new_eNb_dlsch(1,8);
-    PHY_vars_UE->dlsch_ue[i]  = new_ue_dlsch(1,8);
-
-    if (!PHY_vars_eNb->dlsch_eNb[i]) {
-      printf("Can't get eNb dlsch structures\n");
-      exit(-1);
-    }
-
-    if (!PHY_vars_UE->dlsch_ue[i]) {
-      printf("Can't get ue dlsch structures\n");
-      exit(-1);
-    }
-  }
-
-
-  if (DLSCH_alloc_pdu2.tpmi == 5) {
-    PHY_vars_eNb->dlsch_eNb[0]->pmi_alloc = (unsigned short)(taus()&0xffff);
-    PHY_vars_UE->dlsch_ue[0]->pmi_alloc = PHY_vars_eNb->dlsch_eNb[0]->pmi_alloc;
-    PHY_vars_eNb->eNB_UE_stats[0].DL_pmi_single[0] = PHY_vars_eNb->dlsch_eNb[0]->pmi_alloc;
-  }
-
-  generate_eNb_dlsch_params_from_dci(0,
-                                     &DLSCH_alloc_pdu2,
-                                     0x1234,
-                                     format2_2A_M10PRB,
-                                     PHY_vars_eNb->dlsch_eNb,
-                                     lte_frame_parms,
-                                     SI_RNTI,
-                                     RA_RNTI,
-                                     P_RNTI,
-                                     0); //change this later
-
-
-  /*
-    generate_eNb_dlsch_params_from_dci(0,
-    &CCCH_alloc_pdu,
-    SI_RNTI,
-    format1A,
-    &dlsch_eNb_cntl,
-    lte_frame_parms,
-    SI_RNTI,
-    RA_RNTI,
-    P_RNTI);
-  */
-
-
-  //  input_data     = (unsigned char*) malloc(block_length/8);
-  //  decoded_output = (unsigned char*) malloc(block_length/8);
-
-  // DCI
-
-  memcpy(&dci_alloc[0].dci_pdu[0],&DLSCH_alloc_pdu2,sizeof(DCI2_5MHz_2A_M10PRB_TDD_t));
-  dci_alloc[0].dci_length = sizeof_DCI2_5MHz_2A_M10PRB_TDD_t;
-  dci_alloc[0].L          = 3;
-  dci_alloc[0].rnti       = 0x1234;
-  /*
-    memcpy(&dci_alloc[0].dci_pdu[0],&CCCH_alloc_pdu,sizeof(DCI1A_5MHz_TDD_1_6_t));
-    dci_alloc[0].dci_length = sizeof_DCI1A_5MHz_TDD_1_6_t;
-    dci_alloc[0].L          = 3;
-    dci_alloc[0].rnti       = SI_RNTI;
-  */
-
-  memcpy(&dci_alloc[1].dci_pdu[0],&UL_alloc_pdu,sizeof(DCI0_5MHz_TDD0_t));
-  dci_alloc[1].dci_length = sizeof_DCI0_5MHz_TDD_0_t;
-  dci_alloc[1].L          = 3;
-  dci_alloc[1].rnti       = 0x1234;
-
-
-
-
-  // DLSCH
-  if (1) {
-    input_buffer_length = PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->TBS/8;
-
-    printf("dlsch0: TBS      %d\n",PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->TBS);
-
-    printf("Input buffer size %d bytes\n",input_buffer_length);
-
-
-    input_buffer = (unsigned char *)malloc(input_buffer_length+4);
-
-    for (i=0; i<input_buffer_length; i++)
-      input_buffer[i]= (unsigned char)(taus()&0xff);
-
-    dlsch_encoding(input_buffer,
-                   lte_frame_parms,
-                   PHY_vars_eNb->dlsch_eNb[0]);
-
-#ifdef OUTPUT_DEBUG
-
-    for (s=0; s<PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->C; s++) {
-      if (s<PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->Cminus)
-        Kr = PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->Kminus;
-      else
-        Kr = PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->Kplus;
-
-      Kr_bytes = Kr>>3;
-
-      for (i=0; i<Kr_bytes; i++)
-        printf("%d : (%x)\n",i,PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->c[s][i]);
-    }
-
-#endif
-
-    re_allocated = dlsch_modulation(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                                    1024,
-                                    0,
-                                    &PHY_vars_eNb->lte_frame_parms,
-                                    PHY_vars_eNb->dlsch_eNb[0]);
-
-
-    printf("RB count %d (%d,%d)\n",re_allocated,re_allocated/lte_frame_parms->num_dlsch_symbols/12,lte_frame_parms->num_dlsch_symbols);
-
-
-
-    if (num_layers>1)
-      re_allocated = dlsch_modulation(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                                      1024,
-                                      0,
-                                      &PHY_vars_eNb->lte_frame_parms,
-                                      PHY_vars_eNb->dlsch_eNb[1]);
-  }
-
-  else {  // PBCH + DLSCH CNTL
-    input_buffer_length = PHY_vars_eNb->dlsch_eNb_cntl->harq_processes[0]->TBS/8;
-    printf("Input buffer size %d bytes\n",input_buffer_length);
-
-    input_buffer = (unsigned char *)malloc(input_buffer_length+4);
-
-    for (i=0; i<input_buffer_length; i++)
-      input_buffer[i]= (unsigned char)(taus()&0xff);
-
-    dlsch_encoding(input_buffer,
-                   &PHY_vars_eNb->lte_frame_parms,
-                   PHY_vars_eNb->dlsch_eNb_cntl);
-
-#ifdef OUTPUT_DEBUG
-
-    for (s=0; s<PHY_vars_eNb->dlsch_eNb_cntl->harq_processes[0]->C; s++) {
-      if (s<PHY_vars_eNb->dlsch_eNb_cntl->harq_processes[0]->Cminus)
-        Kr = PHY_vars_eNb->dlsch_eNb_cntl->harq_processes[0]->Kminus;
-      else
-        Kr = PHY_vars_eNb->dlsch_eNb_cntl->harq_processes[0]->Kplus;
-
-      Kr_bytes = Kr>>3;
-
-      for (i=0; i<Kr_bytes; i++)
-        printf("%d : (%x)\n",i,PHY_vars_eNb->dlsch_eNb_cntl->harq_processes[0]->c[s][i]);
-    }
-
-#endif
-
-    re_allocated = dlsch_modulation(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                                    1024,
-                                    0,
-                                    &PHY_vars_eNb->lte_frame_parms,
-                                    PHY_vars_eNb->dlsch_eNb_cntl);
-
-
-    printf("RB count %d (%d,%d)\n",re_allocated,re_allocated/lte_frame_parms->num_dlsch_symbols/12,lte_frame_parms->num_dlsch_symbols);
-
-    if ((re_allocated/(lte_frame_parms->num_dlsch_symbols*12)) != NB_RB)
-      printf("Bad RB count %d (%d,%d)\n",re_allocated,re_allocated/lte_frame_parms->num_dlsch_symbols/12,lte_frame_parms->num_dlsch_symbols);
-
-
-
-    generate_pss(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                 1024,
-                 &PHY_vars_eNb->lte_frame_parms,
-                 eNb_id,
-                 6-PHY_vars_eNb->lte_frame_parms.Ncp,
-                 0);
-
-    for (i=0; i<6; i++)
-      pbch_pdu[i] = i;
-
-    generate_pbch(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                  1024,
-                  &PHY_vars_eNb->lte_frame_parms,
-                  pbch_pdu);
-
-  }
-
-  generate_dci_top(1,
-                   0,
-                   dci_alloc,
-                   0,
-                   1024,
-                   &PHY_vars_eNb->lte_frame_parms,
-                   PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                   0);
-
-  generate_pilots(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id],
-                  1024,
-                  &PHY_vars_eNb->lte_frame_parms,
-                  eNb_id,
-                  LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
-
-
-  ch = (struct complex**) malloc(4 * sizeof(struct complex*));
-
-  for (i = 0; i<4; i++)
-    ch[i] = (struct complex*) malloc(channel_length * sizeof(struct complex));
-
-
-#ifdef IFFT_FPGA
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsigF0.m","txsF0", PHY_vars_eNb->lte_eNB_common_vars.txdataF[0][0],300*120,1,4);
-  write_output("txsigF1.m","txsF1", PHY_vars_eNb->lte_eNB_common_vars.txdataF[0][1],300*120,1,4);
-#endif
-
-  // do talbe lookup and write results to txdataF2
-  for (aa=0; aa<lte_frame_parms->nb_antennas_tx; aa++) {
-    ind = 0;
-
-    for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX; i++)
-      if (((i%512)>=1) && ((i%512)<=150))
-        txdataF2[aa][i] = ((int*)mod_table)[PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id][aa][ind++]];
-      else if ((i%512)>=362)
-        txdataF2[aa][i] = ((int*)mod_table)[PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id][aa][ind++]];
-      else
-        txdataF2[aa][i] = 0;
-
-    //    printf("ind=%d\n",ind);
-  }
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsigF20.m","txsF20", txdataF2[0],FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX,1,1);
-#endif
-
-  tx_lev = 0;
-
-  for (aa=0; aa<lte_frame_parms->nb_antennas_tx; aa++) {
-    PHY_ofdm_mod(txdataF2[aa],        // input
-                 txdata[aa],         // output
-                 lte_frame_parms->log2_symbol_size,                // log2_fft_size
-                 NUMBER_OF_SYMBOLS_PER_FRAME,                 // number of symbols
-                 lte_frame_parms->nb_prefix_samples,               // number of prefix samples
-                 lte_frame_parms->twiddle_ifft,  // IFFT twiddle factors
-                 lte_frame_parms->rev,           // bit-reversal permutation
-                 CYCLIC_PREFIX);
-
-    tx_lev += signal_energy(&txdata[aa][4*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES],
-                            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-  }
-
-#else //IFFT_FPGA
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsigF0.m","txsF0", PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id][0],FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX/5,1,1);
-  //write_output("txsigF1.m","txsF1", PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id][1],FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX/5,1,1);
-#endif
-
-  tx_lev = 0;
-
-  for (aa=0; aa<lte_frame_parms->nb_antennas_tx; aa++) {
-    PHY_ofdm_mod(PHY_vars_eNb->lte_eNB_common_vars.txdataF[eNb_id][aa],        // input
-                 txdata[aa],         // output
-                 PHY_vars_eNb->lte_frame_parms.log2_symbol_size,                // log2_fft_size
-                 NUMBER_OF_SYMBOLS_PER_FRAME,                 // number of symbols
-                 PHY_vars_eNb->lte_frame_parms.nb_prefix_samples,               // number of prefix samples
-                 PHY_vars_eNb->lte_frame_parms.twiddle_ifft,  // IFFT twiddle factors
-                 PHY_vars_eNb->lte_frame_parms.rev,           // bit-reversal permutation
-                 CYCLIC_PREFIX);
-
-    tx_lev += signal_energy(&txdata[aa][OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*4],
-                            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-
-  }
-
-#endif //IFFT_FPGA
-
-
-  printf("tx_lev = %d\n",tx_lev);
-  tx_lev_dB = (unsigned int) dB_fixed(tx_lev);
-
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsig0.m","txs0", txdata[0],FRAME_LENGTH_COMPLEX_SAMPLES,1,1);
-#endif
-
-  // multipath channel
-
-
-  for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES; i++) {
-    for (aa=0; aa<lte_frame_parms->nb_antennas_tx; aa++) {
-      s_re[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)]);
-      s_im[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)+1]);
-    }
-  }
-
-  printf("tx_lev_dB = %d\n",tx_lev_dB);
-
-
-  for (ch_realization=0; ch_realization<100; ch_realization++) {
-
-    printf("**********************Channel Realization Index = %d **************************\n", ch_realization);
-
-#ifdef AWGN // copy s_re and s_im to r_re and r_im
-
-    for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES; i++) {
-      for (aa=0; aa<lte_frame_parms->nb_antennas_tx; aa++) {
-        r_re[aa][i] = s_re[aa][i];
-        r_im[aa][i] = s_im[aa][i];
-      }
-    }
-
-#else
-    multipath_channel(ch,s_re,s_im,r_re,r_im,
-                      amps,Td,BW,ricean_factor,aoa,
-                      lte_frame_parms->nb_antennas_tx,
-                      lte_frame_parms->nb_antennas_rx,
-                      FRAME_LENGTH_COMPLEX_SAMPLES,
-                      channel_length,0,
-                      1,1,0,0);
-    //(double)tx_lev_dB - (SNR+sigma2_dB));
-#endif
-
-#ifdef OUTPUT_DEBUG
-    write_output("channel0.m","chan0",ch[0],channel_length,1,8);
-#endif
-
-    for (SNR=snr0; SNR<snr1; SNR+=.2) {
-
-      sigma2_dB = 10*log10(tx_lev) + 10*log10(lte_frame_parms->ofdm_symbol_size/(NB_RB*12)) - SNR;
-
-      printf("**********************SNR = %f dB (tx_lev %f, sigma2_dB %f)**************************\n",
-             SNR,
-             (double)10*log10(tx_lev)+10*log10(lte_frame_parms->ofdm_symbol_size/(NB_RB*12)),
-             sigma2_dB);
-
-      errs=0;
-      dci_errors=0;
-
-
-      for (trials = 0; trials<n_frames; trials++) {
-        //AWGN
-        sigma2 = pow(10,sigma2_dB/10);
-
-
-        for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES; i++) {
-          if ((i/640)%3!=0) {
-            for (aa=0; aa<lte_frame_parms->nb_antennas_rx; aa++) {
-              ((short*) PHY_vars_UE->lte_ue_common_vars.rxdata[aa])[2*i] = (short) (r_re[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0));
-              ((short*) PHY_vars_UE->lte_ue_common_vars.rxdata[aa])[2*i+1] = (short) (r_im[aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0));
-            }
-          } else {
-            for (aa=0; aa<lte_frame_parms->nb_antennas_rx; aa++) {
-              ((short*) PHY_vars_UE->lte_ue_common_vars.rxdata[aa])[2*i] = (short) (r_re[aa][i]);
-              ((short*) PHY_vars_UE->lte_ue_common_vars.rxdata[aa])[2*i+1] = (short) (r_im[aa][i]);
-            }
-          }
-        }
-
-        //    lte_sync_time_init(lte_frame_parms,lte_ue_common_vars);
-        //    lte_sync_time(lte_ue_common_vars->rxdata, lte_frame_parms);
-        //    lte_sync_time_free();
-
-        /*
-        // optional: read rx_frame from file
-        if ((rx_frame_file = fopen("rx_frame.dat","r")) == NULL)
-        {
-        printf("Cannot open rx_frame.m data file\n");
-        exit(0);
-        }
-
-        result = fread((void *)PHY_vars->rx_vars[0].RX_DMA_BUFFER,4,FRAME_LENGTH_COMPLEX_SAMPLES,rx_frame_file);
-        printf("Read %d bytes\n",result);
-        result = fread((void *)PHY_vars->rx_vars[1].RX_DMA_BUFFER,4,FRAME_LENGTH_COMPLEX_SAMPLES,rx_frame_file);
-        printf("Read %d bytes\n",result);
-
-        fclose(rx_frame_file);
-        */
-
-        rx_lev_data_sym = signal_energy(&PHY_vars_UE->lte_ue_common_vars.rxdata[0][OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*4],OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-        rx_lev_null_sym = signal_energy(&PHY_vars_UE->lte_ue_common_vars.rxdata[0][13*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES],OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-        rx_snr_dB = dB_fixed(rx_lev_data_sym - rx_lev_null_sym) - dB_fixed(rx_lev_null_sym);
-#ifdef OUTPUT_DEBUG
-        printf("RX level in data symbol (lin) %d\n",rx_lev_data_sym);
-        printf("RX level in null symbol (lin) %d\n",rx_lev_null_sym);
-        printf("RX SNR (dB) %d\n",rx_snr_dB);
-#endif
-
-        // Inner receiver scheduling for 3 slots
-        for (Ns=0; Ns<3; Ns++) {
-          for (l=0; l<6; l++) {
-            //      printf("Ns %d, l %d\n",Ns,l);
-            // channel estimation happens in slot_fep
-            slot_fep(&PHY_vars_UE->lte_frame_parms,
-                     &PHY_vars_UE->lte_ue_common_vars,
-                     l,
-                     Ns%20,
-                     0,
-                     0);
-
-            if (l%6==0) {
-              // fill &(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][aa][512*3..512*6-1] with Re=ONE_Q15 Im=0
-            }
-
-            if (l%6==3) {
-              // fill &(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][aa][0..512*3] with Re=ONE_Q15 Im=0
-            }
-
-            lte_ue_measurements(PHY_vars_UE,
-                                &PHY_vars_UE->lte_frame_parms,
-                                0,
-                                1,
-                                1);
-            //printf("rx_avg_power_dB %d\n",PHY_vars_UE->PHY_measurements.wideband_cqi_tot[0]);
-            //printf("n0_power_dB %d\n",PHY_vars_UE->PHY_measurements.n0_power_dB[0]);
-
-            if ((Ns==0) && (l==3)) {// process symbols 0,1,2
-
-
-#ifndef NO_DCI
-              rx_pdcch(&PHY_vars_UE->lte_ue_common_vars,
-                       PHY_vars_UE->lte_ue_pdcch_vars,
-                       &PHY_vars_UE->lte_frame_parms,
-                       eNb_id,
-                       2,
-                       (PHY_vars_UE->lte_frame_parms.mode1_flag == 1) ? SISO : ALAMOUTI,
-                       0);
-
-              dci_cnt = dci_decoding_procedure(PHY_vars_UE->lte_ue_pdcch_vars,dci_alloc_rx,eNb_id,&PHY_vars_UE->lte_frame_parms,SI_RNTI,RA_RNTI);
-              //              printf("dci_cnt %d\n",dci_cnt);
-              //              write_output("dlsch00_ch0.m","dl00_ch0",&(lte_ue_common_vars->dl_ch_estimates[eNb_id][0][0]),(6*(lte_frame_parms->ofdm_symbol_size)),1,1);
-              //              exit(-1);
-
-
-              for (i=0; i<dci_cnt; i++) {
-                if ((dci_alloc_rx[i].rnti == 0x1234) && (dci_alloc_rx[i].format == format2_2A_M10PRB) &&
-                    (generate_ue_dlsch_params_from_dci(0,
-                                                       (DCI2_5MHz_2A_M10PRB_TDD_t *)&dci_alloc_rx[i].dci_pdu,
-                                                       0x1234,
-                                                       format2_2A_M10PRB,
-                                                       PHY_vars_UE->dlsch_ue,
-                                                       &PHY_vars_UE->lte_frame_parms,
-                                                       SI_RNTI,
-                                                       RA_RNTI,
-                                                       P_RNTI)==0)) {
-                  dlsch_active = 1;
-                } else {
-                  dlsch_active = 0;
-                  dci_errors++;
-                  errs++;
-                }
-              }
-
-              /*
-                else if ((dci_alloc_rx[i].rnti == SI_RNTI) && (dci_alloc_rx[i].format == format1A))
-                generate_ue_dlsch_params_from_dci(0,
-                (DCI1A_5MHz_TDD_1_6_t *)&dci_alloc_rx[i].dci_pdu,
-                SI_RNTI,
-                format1A,
-                &dlsch_ue_cntl,
-                lte_frame_parms,
-                SI_RNTI,
-                RA_RNTI,
-                P_RNTI);
-              */
-              //              msg("dci_cnt = %d\n",dci_cnt);
-
-
-#else
-              generate_ue_dlsch_params_from_dci(0,
-                                                &DLSCH_alloc_pdu2,
-                                                0x1234,
-                                                format2_2A_M10PRB,
-                                                PHY_vars_UE->dlsch_ue,
-                                                &PHY_vars_UE->lte_frame_parms,
-                                                SI_RNTI,
-                                                RA_RNTI,
-                                                P_RNTI);
-              dlsch_active = 1;
-#endif
-
-            }
-
-            /*
-              for (m=lte_frame_parms->first_dlsch_symbol;m<3;m++)
-              rx_dlsch(lte_ue_common_vars,
-              lte_ue_dlsch_vars,
-              lte_frame_parms,
-              eNb_id,
-              eNb_id_i,
-              m,
-              rb_alloc,
-              mod_order,
-              mimo_mode,
-              dual_stream_UE);
-            */
-            if (dlsch_active == 1) {
-              if ((Ns==1) && (l==0)) // process symbols 3,4,5
-                for (m=4; m<6; m++)
-                  rx_dlsch(&PHY_vars_UE->lte_ue_common_vars,
-                           PHY_vars_UE->lte_ue_dlsch_vars,
-                           &PHY_vars_UE->lte_frame_parms,
-                           eNb_id,
-                           eNb_id_i,
-                           PHY_vars_UE->dlsch_ue,
-                           m,
-                           dual_stream_UE,
-                           &PHY_vars_UE->PHY_measurements,
-                           0);
-
-              if ((Ns==1) && (l==3)) {// process symbols 6,7,8
-                /*
-                  if (rx_pbch(lte_ue_common_vars,
-                  lte_ue_pbch_vars[0],
-                  lte_frame_parms,
-                  0,
-                  SISO)) {
-                  msg("pbch decoded sucessfully!\n");
-                  }
-                  else {
-                  msg("pbch not decoded!\n");
-                  }
-                */
-                for (m=7; m<9; m++)
-                  rx_dlsch(&PHY_vars_UE->lte_ue_common_vars,
-                           PHY_vars_UE->lte_ue_dlsch_vars,
-                           &PHY_vars_UE->lte_frame_parms,
-                           eNb_id,
-                           eNb_id_i,
-                           PHY_vars_UE->dlsch_ue,
-                           m,
-                           dual_stream_UE,
-                           &PHY_vars_UE->PHY_measurements,
-                           0);
-              }
-
-              if ((Ns==2) && (l==0))  // process symbols 10,11, do deinterleaving for TTI
-                for (m=10; m<12; m++)
-                  rx_dlsch(&PHY_vars_UE->lte_ue_common_vars,
-                           PHY_vars_UE->lte_ue_dlsch_vars,
-                           &PHY_vars_UE->lte_frame_parms,
-                           eNb_id,
-                           eNb_id_i,
-                           PHY_vars_UE->dlsch_ue,
-                           m,
-                           dual_stream_UE,
-                           &PHY_vars_UE->PHY_measurements,
-                           0);
-
-            }
-          }
-        }
-
-        if(trials==0) {
-          fprintf(csv_fd,"%f,%d,%d,%d",SNR, rx_lev_data_sym , rx_lev_null_sym, rx_snr_dB);
-          data= &(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][0][0]);
-
-          for (ii=10; ii<((1*(PHY_vars_UE->lte_frame_parms.ofdm_symbol_size))<<1)-414; ii+=2) {
-            fprintf(csv_fd,",%d+1i*(%d)",((short *)data)[ii], ((short *)data)[ii+1]);
-          }
-
-          fprintf(csv_fd,",");
-        }
-
-        //  if(SNR==snr0)
-        // fprintf(csv_fd,"%d\n",one);
-        //  else
-        //  fprintf(csv_fd,"%e\n",blerr);
-
-        //printf("%d + j*(%d)\n",((short *)data)[i],((short *)data)[i+1]);
-
-        //fprintf(csv_fd,"%f, %d, %d",SNR, rx_lev_data_sym , rx_lev_null_sym, );
-
-        if (dlsch_active == 1) {
-#ifdef OUTPUT_DEBUG
-          write_output("rxsig0.m","rxs0", PHY_vars_UE->lte_ue_common_vars.rxdata[0],FRAME_LENGTH_COMPLEX_SAMPLES,1,1);
-          write_output("dlsch00_ch0.m","dl00_ch0",&(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][0][0]),(6*(PHY_vars_UE->lte_frame_parms.ofdm_symbol_size)),1,1);
-          /*
-            write_output("dlsch01_ch0.m","dl01_ch0",&(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][1][0]),(6*(lte_frame_parms->ofdm_symbol_size)),1,1);
-            write_output("dlsch10_ch0.m","dl10_ch0",&(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][2][0]),(6*(lte_frame_parms->ofdm_symbol_size)),1,1);
-            write_output("dlsch11_ch0.m","dl11_ch0",&(PHY_vars_UE->lte_ue_common_vars.dl_ch_estimates[eNb_id][3][0]),(6*(lte_frame_parms->ofdm_symbol_size)),1,1);
-          */
-          write_output("rxsigF0.m","rxsF0", PHY_vars_UE->lte_ue_common_vars.rxdataF[0],2*12*PHY_vars_UE->lte_frame_parms.ofdm_symbol_size,2,1);
-          write_output("rxsigF0_ext.m","rxsF0_ext", PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->rxdataF_ext[0],2*12*PHY_vars_UE->lte_frame_parms.ofdm_symbol_size,1,1);
-          write_output("dlsch00_ch0_ext.m","dl00_ch0_ext",PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->dl_ch_estimates_ext[0],300*12,1,1);
-          write_output("pdcchF0_ext.m","pdcchF_ext", PHY_vars_UE->lte_ue_pdcch_vars[eNb_id]->rxdataF_ext[0],2*3*PHY_vars_UE->lte_frame_parms.ofdm_symbol_size,1,1);
-          write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",PHY_vars_UE->lte_ue_pdcch_vars[eNb_id]->dl_ch_estimates_ext[0],300*3,1,1);
-          /*
-            write_output("dlsch01_ch0_ext.m","dl01_ch0_ext",lte_ue_dlsch_vars[eNb_id]->dl_ch_estimates_ext[1],300*12,1,1);
-            write_output("dlsch10_ch0_ext.m","dl10_ch0_ext",lte_ue_dlsch_vars[eNb_id]->dl_ch_estimates_ext[2],300*12,1,1);
-            write_output("dlsch11_ch0_ext.m","dl11_ch0_ext",lte_ue_dlsch_vars[eNb_id]->dl_ch_estimates_ext[3],300*12,1,1);
-            write_output("dlsch_rho.m","dl_rho",lte_ue_dlsch_vars[eNb_id]->rho[0],300*12,1,1);
-          */
-          write_output("dlsch_rxF_comp0.m","dlsch0_rxF_comp0",PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->rxdataF_comp[0],300*12,1,1);
-          write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",PHY_vars_UE->lte_ue_pdcch_vars[eNb_id]->rxdataF_comp[0],4*300,1,1);
-          write_output("dlsch_rxF_llr.m","dlsch_llr",PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->llr[0],coded_bits_per_codeword,1,0);
-          write_output("pdcch_rxF_llr.m","pdcch_llr",PHY_vars_UE->lte_ue_pdcch_vars[eNb_id]->llr,2400,1,4);
-
-          write_output("dlsch_mag1.m","dlschmag1",PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->dl_ch_mag,300*12,1,1);
-          write_output("dlsch_mag2.m","dlschmag2",PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->dl_ch_magb,300*12,1,1);
-#endif //OUTPUT_DEBUG
-
-          //  printf("Calling decoding (Ndi %d, harq_pid %d)\n",
-          //       dlsch_ue[0]->harq_processes[0]->Ndi,
-          //       dlsch_ue[0]->current_harq_pid);
-
-
-          ret = dlsch_decoding(PHY_vars_UE->lte_ue_dlsch_vars[eNb_id]->llr[0],
-                               &PHY_vars_UE->lte_frame_parms,
-                               PHY_vars_UE->dlsch_ue[0],
-                               0);
-
-          if (ret <= MAX_TURBO_ITERATIONS) {
-#ifdef OUTPUT_DEBUG
-            printf("No DLSCH errors found\n");
-#endif
-          } else {
-            errs++;
-#ifdef OUTPUT_DEBUG
-            printf("DLSCH in error\n");
-#endif
-          }
-
-
-#ifdef OUTPUT_DEBUG
-
-          for (s=0; s<PHY_vars_UE->dlsch_ue[0]->harq_processes[0]->C; s++) {
-            if (s<PHY_vars_UE->dlsch_ue[0]->harq_processes[0]->Cminus)
-              Kr = PHY_vars_UE->dlsch_ue[0]->harq_processes[0]->Kminus;
-            else
-              Kr = PHY_vars_UE->dlsch_ue[0]->harq_processes[0]->Kplus;
-
-            Kr_bytes = Kr>>3;
-
-            printf("Decoded_output (Segment %d):\n",s);
-
-            for (i=0; i<Kr_bytes; i++)
-              printf("%d : %x (%x)\n",i,PHY_vars_UE->dlsch_ue[0]->harq_processes[0]->c[s][i],PHY_vars_UE->dlsch_ue[0]->harq_processes[0]->c[s][i]^PHY_vars_eNb->dlsch_eNb[0]->harq_processes[0]->c[s][i]);
-          }
-
-          exit(-1);
-#endif
-
-          if (errs==1000)
-            break;
-        }
-      }   //trials
-
-      printf("Errors %d/%d, Pe = %e, dci_errors %d/%d, Pe = %e\n",errs,1+trials,(double)errs/(trials+1),dci_errors,1+trials,(double)dci_errors/(trials+1));
-      blerr= (double)errs/(trials+1);
-      fprintf(bler_fd,"%f,%e;\n",SNR,blerr);
-      fprintf(csv_fd,"%e;\n",blerr);
-
-      if(blerr<.001)
-        break;
-    }//SNR
-
-  } // Channel Realizations
-
-  fprintf(csv_fd,"];");
-  fclose(bler_fd);
-  fclose(csv_fd);
-
-  printf("Freeing dlsch structures\n");
-
-  for (i=0; i<2; i++) {
-    printf("eNb %d\n",i);
-    free_eNb_dlsch(PHY_vars_eNb->dlsch_eNb[i]);
-    printf("UE %d\n",i);
-    free_ue_dlsch(PHY_vars_UE->dlsch_ue[i]);
-  }
-
-
-#ifdef IFFT_FPGA
-  printf("Freeing transmit signals\n");
-  free(txdataF2[0]);
-  free(txdataF2[1]);
-  free(txdataF2);
-  free(txdata[0]);
-  free(txdata[1]);
-  free(txdata);
-#endif
-
-  printf("Freeing channel I/O\n");
-
-  for (i=0; i<2; i++) {
-    free(s_re[i]);
-    free(s_im[i]);
-    free(r_re[i]);
-    free(r_im[i]);
-  }
-
-  free(s_re);
-  free(s_im);
-  free(r_re);
-  free(r_im);
-  // }
-  //  lte_sync_time_free();
-
-  return(0);
-}
-
-
-
diff --git a/openair1/SIMULATION/LTE_MUMIMO/dlsim2.c b/openair1/SIMULATION/LTE_MUMIMO/dlsim2.c
deleted file mode 100644
index 22a919de50e2e5a06f764e58e8f642efcd9d2c90..0000000000000000000000000000000000000000
--- a/openair1/SIMULATION/LTE_MUMIMO/dlsim2.c
+++ /dev/null
@@ -1,1073 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-#include <string.h>
-#include <math.h>
-#include <unistd.h>
-#include "SIMULATION/TOOLS/defs.h"
-#include "PHY/types.h"
-#include "PHY/defs.h"
-#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
-#ifdef IFFT_FPGA
-#include "PHY/LTE_REFSIG/mod_table.h"
-#endif
-
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/vars.h"
-#include "SCHED/defs.h"
-#include "SCHED/vars.h"
-
-#define AWGN
-#define NO_DCI
-
-#define BW 7.68
-#define Td 1.0
-
-//#define OUTPUT_DEBUG 1
-
-#define RBmask0 0x00fc00fc
-#define RBmask1 0x0
-#define RBmask2 0x0
-#define RBmask3 0x0
-
-/*
-  unsigned char dlsch_cqi;
-
-  PHY_VARS_eNB *PHY_vars_eNb;
-  PHY_VARS_UE *PHY_vars_UE;
-
-  void lte_param_init(unsigned char N_tx, unsigned char N_rx,unsigned char transmission_mode) {
-
-  unsigned int ind;
-
-  printf("Start lte_param_init\n");
-  PHY_vars_eNb = malloc(sizeof(PHY_VARS_eNB));
-  PHY_vars_UE = malloc(sizeof(PHY_VARS_UE));
-  PHY_config = malloc(sizeof(PHY_CONFIG));
-  mac_xface = malloc(sizeof(MAC_xface));
-
-  randominit(0);
-  set_taus_seed(0);
-
-  lte_frame_parms = &(PHY_vars_eNb->lte_frame_parms);
-
-  lte_frame_parms->N_RB_DL            = 25;   //50 for 10MHz and 25 for 5 MHz
-  lte_frame_parms->N_RB_UL            = 25;
-  lte_frame_parms->Ncp                = 1;
-  lte_frame_parms->Nid_cell           = 0;
-  lte_frame_parms->nushift            = 0;
-  lte_frame_parms->nb_antennas_tx     = N_tx;
-  lte_frame_parms->nb_antennas_rx     = N_rx;
-  lte_frame_parms->first_dlsch_symbol = 4;
-  lte_frame_parms->num_dlsch_symbols  = 6;
-  lte_frame_parms->mode1_flag = (transmission_mode == 1)? 1 : 0;
-
-  init_frame_parms(lte_frame_parms);
-
-  copy_lte_parms_to_phy_framing(lte_frame_parms, &(PHY_config->PHY_framing));
-
-  phy_init_top(N_tx); //allocation
-
-  lte_frame_parms->twiddle_fft      = twiddle_fft;
-  lte_frame_parms->twiddle_ifft     = twiddle_ifft;
-  lte_frame_parms->rev              = rev;
-
-  PHY_vars_UE->lte_frame_parms = *lte_frame_parms;
-
-  lte_gold(lte_frame_parms);
-  generate_ul_ref_sigs();
-  generate_ul_ref_sigs_rx();
-  generate_64qam_table();
-  generate_16qam_table();
-  generate_RIV_tables();
-
-  generate_pcfich_reg_mapping(lte_frame_parms);
-  generate_phich_reg_mapping_ext(lte_frame_parms);
-
-  phy_init_lte_ue(&PHY_vars_UE->lte_frame_parms,
-  &PHY_vars_UE->lte_ue_common_vars,
-  PHY_vars_UE->lte_ue_dlsch_vars,
-  PHY_vars_UE->lte_ue_dlsch_vars_SI,
-  PHY_vars_UE->lte_ue_dlsch_vars_ra,
-  PHY_vars_UE->lte_ue_pbch_vars,
-  PHY_vars_UE->lte_ue_pdcch_vars,
-  PHY_vars_UE);
-
-  phy_init_lte_eNB(&PHY_vars_eNb->lte_frame_parms,
-  &PHY_vars_eNb->lte_eNB_common_vars,
-  PHY_vars_eNb->lte_eNB_ulsch_vars,
-  0,
-  PHY_vars_eNb);
-
-
-  printf("Done lte_param_init\n");
-
-
-  }
-*/
-
-#define UL_RB_ALLOC 0x1ff;
-#define CCCH_RB_ALLOC computeRIV(frame_parms->N_RB_UL,0,2)
-#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
-//#define DLSCH_RB_ALLOC 0x1f0f // igore DC component,RB13
-
-
-int main(int argc, char **argv)
-{
-
-  char c;
-  int i,j,aa,s,ind,Kr,Kr_bytes;;
-  double sigma2,sigma2_dB,SNR,snr0,snr1,SNRmeas;
-  //int **txdataF, **txdata;
-  int **txdata;
-#ifdef IFFT_FPGA
-  int **txdataF2;
-#endif
-  double **s_re,**s_im,***r_re,***r_im;
-  double amps[8] = {0.3868472 , 0.3094778 , 0.1547389 , 0.0773694 , 0.0386847 , 0.0193424 , 0.0096712 , 0.0038685};
-  double aoa=.03,ricean_factor=1; //0.0000005;
-  int channel_length,nb_taps=8;
-  double forgetting_factor=0.99,maxDoppler=0;
-  double path_loss_dB[2] = {0, 0};
-
-  //int eNb_id = 0, eNb_id_i = 1;
-  int sector_id=0;
-  unsigned char mcs,dual_stream_UE = 0;
-  unsigned short NB_RB=conv_nprb(0,DLSCH_RB_ALLOC);
-  unsigned char Ns,l,m;
-
-  unsigned char *input_data,*decoded_output;
-
-  unsigned char *input_buffer;
-  unsigned short input_buffer_length;
-  unsigned int ret;
-  unsigned int coded_bits_per_codeword,nsymb,dci_cnt;
-
-  unsigned int tx_lev,tx_lev_dB,trials,errs=0,dci_errors=0,dlsch_active=0;
-  unsigned int transmission_mode, num_layers;
-  int re_allocated;
-  FILE *bler_fd;
-  FILE *csv_fd;
-  char bler_fname[20];
-  char csv_fname[20];
-
-  unsigned char pbch_pdu[6];
-
-  DCI_ALLOC_t dci_alloc[8],dci_alloc_rx[8];
-  //DCI0_5MHz_TDD0_t          UL_alloc_pdu;
-  DCI1A_5MHz_TDD_1_6_t      CCCH_alloc_pdu;
-  //DCI2_5MHz_2A_L10PRB_TDD_t DLSCH_alloc_pdu1;
-  DCI2_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2[NUMBER_OF_UE_MAX];
-  int num_common_dci=0,num_ue_spec_dci=0;
-
-  FILE *rx_frame_file;
-  int result;
-
-  int n_frames;
-  int cnt=0;
-  int rx_lev_data_sym;
-  int rx_lev_null_sym;
-  int rx_snr_dB;
-  void *data;
-  int ii;
-  int bler;
-  double blerr;
-  int ch_realization;
-
-  int eNB_id,UE_id,NB_UE_INST=1,NB_CH_INST=1;
-
-  channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX];
-  channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX];
-
-  LTE_DL_FRAME_PARMS *frame_parms;
-
-  uint8_t num_pdcch_symbols = 3;
-
-  // Init simulation parameters
-
-  transmission_mode = 6;
-  num_layers = 1;
-  mcs = 0;
-  n_frames = 100;
-  snr0 = 10;
-
-  //if(snr0>0)
-  // snr0 = 0;
-  while ((c = getopt (argc, argv, "hm:n:s:")) != -1) {
-    switch (c) {
-    case 'h':
-      printf("%s -h(elp) -m mcs -n n_frames -s snr0\n",argv[0]);
-      exit(1);
-
-    case 'm':
-      mcs = atoi(optarg);
-      break;
-
-    case 'n':
-      n_frames = atoi(optarg);
-      break;
-
-    case 's':
-      snr0 = atoi(optarg);
-      break;
-
-    default:
-      printf("%s -h(elp) -m mcs -n n_frames -s snr0\n",argv[0]);
-      exit (-1);
-      break;
-    }
-  }
-
-  printf("Setting mcs = %d\n",mcs);
-  printf("NPRB = %d\n",NB_RB);
-  printf("n_frames = %d\n",n_frames);
-
-  snr1 = snr0+0.1;
-  printf("SNR0 %f, SNR1 %f\n",snr0,snr1);
-
-  // Init PHY parameters
-
-  PHY_vars_eNb_g = malloc(NB_CH_INST*sizeof(PHY_VARS_eNB*));
-
-  for (eNB_id=0; eNB_id<NB_CH_INST; eNB_id++) {
-    PHY_vars_eNb_g[eNB_id] = malloc(sizeof(PHY_VARS_eNB));
-    PHY_vars_eNb_g[eNB_id]->Mod_id=eNB_id;
-  }
-
-  //  PHY_VARS_UE *PHY_vars_UE;
-  PHY_vars_UE_g = malloc(NB_UE_INST*sizeof(PHY_VARS_UE*));
-
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) { // begin navid
-    PHY_vars_UE_g[UE_id] = malloc(sizeof(PHY_VARS_UE));
-    PHY_vars_UE_g[UE_id]->Mod_id=UE_id;
-  }// end navid
-
-  PHY_config = malloc(sizeof(PHY_CONFIG));
-  mac_xface = malloc(sizeof(MAC_xface));
-  mac_xface->frame = -1;
-
-  frame_parms = malloc(sizeof(LTE_DL_FRAME_PARMS));
-  frame_parms->N_RB_DL            = 25;
-  frame_parms->N_RB_UL            = 25;
-  frame_parms->Ng_times6          = 1;
-  frame_parms->Ncp                = 1;
-  frame_parms->Nid_cell           = 0;
-  frame_parms->nushift            = 0;
-  frame_parms->nb_antennas_tx     = 2;
-  frame_parms->nb_antennas_rx     = 2;
-  frame_parms->first_dlsch_symbol = 4;
-  frame_parms->num_dlsch_symbols  = 6;
-  frame_parms->mode1_flag = (transmission_mode == 1) ? 1 : 0;
-
-  init_frame_parms(frame_parms);
-  copy_lte_parms_to_phy_framing(frame_parms, &(PHY_config->PHY_framing));
-  phy_init_top(NB_ANTENNAS_TX,frame_parms);
-
-  frame_parms->twiddle_fft      = twiddle_fft;
-  frame_parms->twiddle_ifft     = twiddle_ifft;
-  frame_parms->rev              = rev;
-
-  phy_init_lte_top(frame_parms);
-
-  randominit(0);
-  set_taus_seed(0);
-
-  channel_length = (int) 11+2*BW*Td;
-
-  nsymb = (frame_parms->Ncp == 0) ? 14 : 12;
-  coded_bits_per_codeword = NB_RB * (12 * get_Qm(mcs)) * (frame_parms->num_dlsch_symbols);
-  printf("Rate = %f (mod %d)\n",(((double)dlsch_tbs25[get_I_TBS(mcs)][NB_RB-1])*3/4)/coded_bits_per_codeword,
-         get_Qm(mcs));
-
-  sprintf(bler_fname,"bler_%d.m",mcs);
-  bler_fd = fopen(bler_fname,"w");
-  fprintf(bler_fd,"bler = [");
-  // CSV file
-  sprintf(csv_fname,"data_out%d.m",mcs);
-  csv_fd = fopen(csv_fname,"w");
-  fprintf(csv_fd,"data_all=[");
-
-
-#ifdef IFFT_FPGA
-  txdata    = (int **)malloc16(2*sizeof(int*));
-  txdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
-  txdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-
-  bzero(txdata[0],FRAME_LENGTH_BYTES);
-  bzero(txdata[1],FRAME_LENGTH_BYTES);
-
-  txdataF2    = (int **)malloc16(2*sizeof(int*));
-  txdataF2[0] = (int *)malloc16(FRAME_LENGTH_BYTES_NO_PREFIX);
-  txdataF2[1] = (int *)malloc16(FRAME_LENGTH_BYTES_NO_PREFIX);
-
-  bzero(txdataF2[0],FRAME_LENGTH_BYTES_NO_PREFIX);
-  bzero(txdataF2[1],FRAME_LENGTH_BYTES_NO_PREFIX);
-#endif
-
-  r_re = malloc(NB_UE_INST*sizeof(double**));
-  r_im = malloc(NB_UE_INST*sizeof(double**));
-
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-    r_re[UE_id] = malloc(2*sizeof(double*));
-    r_im[UE_id] = malloc(2*sizeof(double*));
-
-    for (i=0; i<2; i++) {
-      r_re[UE_id][i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-      r_im[UE_id][i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-    }
-  }
-
-  s_re = malloc(2*sizeof(double*));
-  s_im = malloc(2*sizeof(double*));
-
-  for (i=0; i<2; i++) {
-    s_re[i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-    s_im[i] = malloc(FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
-  }
-
-  // init eNB vars
-
-  for (eNB_id=0; eNB_id<NB_CH_INST; eNB_id++) {
-    memcpy(&(PHY_vars_eNb_g[eNB_id]->lte_frame_parms), frame_parms, sizeof(LTE_DL_FRAME_PARMS));
-    phy_init_lte_eNB(&PHY_vars_eNb_g[eNB_id]->lte_frame_parms,
-                     &PHY_vars_eNb_g[eNB_id]->lte_eNB_common_vars,
-                     PHY_vars_eNb_g[eNB_id]->lte_eNB_ulsch_vars,
-                     0,
-                     PHY_vars_eNb_g[eNB_id],
-                     0,
-                     0);
-
-    /*
-    PHY_vars_eNb_g[eNB_id]->dlsch_eNb[0] = (LTE_eNb_DLSCH_t**) malloc16(NUMBER_OF_UE_MAX*sizeof(LTE_eNb_DLSCH_t*));
-    PHY_vars_eNb_g[eNB_id]->dlsch_eNb[1] = (LTE_eNb_DLSCH_t**) malloc16(NUMBER_OF_UE_MAX*sizeof(LTE_eNb_DLSCH_t*));
-    PHY_vars_eNb_g[eNB_id]->ulsch_eNb = (LTE_eNb_ULSCH_t**) malloc16(NUMBER_OF_UE_MAX*sizeof(LTE_eNb_ULSCH_t*));
-    */
-
-    for (i=0; i<NB_UE_INST; i++) {
-      for (j=0; j<2; j++) {
-        PHY_vars_eNb_g[eNB_id]->dlsch_eNb[i][j] = new_eNb_dlsch(1,8);
-
-        if (!PHY_vars_eNb_g[eNB_id]->dlsch_eNb[i][j]) {
-          msg("Can't get eNb dlsch structures\n");
-          exit(-1);
-        } else {
-          msg("dlsch_eNb[%d][%d] => %p\n",i,j,PHY_vars_eNb_g[eNB_id]->dlsch_eNb[i][j]);
-          PHY_vars_eNb_g[eNB_id]->dlsch_eNb[i][j]->rnti=0;
-        }
-      }
-
-      PHY_vars_eNb_g[eNB_id]->ulsch_eNb[i] = new_eNb_ulsch(3);
-
-      if (!PHY_vars_eNb_g[eNB_id]->ulsch_eNb[i]) {
-        msg("Can't get eNb ulsch structures\n");
-        exit(-1);
-      }
-
-    }
-
-    PHY_vars_eNb_g[eNB_id]->dlsch_eNb_SI  = new_eNb_dlsch(1,1);
-    PHY_vars_eNb_g[eNB_id]->dlsch_eNb_ra  = new_eNb_dlsch(1,1);
-
-    PHY_vars_eNb_g[eNB_id]->rx_total_gain_eNB_dB=150;
-
-  }
-
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-    memcpy(&(PHY_vars_UE_g[UE_id]->lte_frame_parms), frame_parms, sizeof(LTE_DL_FRAME_PARMS));
-
-    phy_init_lte_ue(&PHY_vars_UE_g[UE_id]->lte_frame_parms,
-                    &PHY_vars_UE_g[UE_id]->lte_ue_common_vars,
-                    PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars,
-                    PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars_SI,
-                    PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars_ra,
-                    PHY_vars_UE_g[UE_id]->lte_ue_pbch_vars,
-                    PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars,
-                    PHY_vars_UE_g[UE_id]);
-
-    /*
-    PHY_vars_UE_g[UE_id]->dlsch_ue[0] = (LTE_UE_DLSCH_t**) malloc16(NUMBER_OF_eNB_MAX*sizeof(LTE_UE_DLSCH_t*));
-    PHY_vars_UE_g[UE_id]->dlsch_ue[1] = (LTE_UE_DLSCH_t**) malloc16(NUMBER_OF_eNB_MAX*sizeof(LTE_UE_DLSCH_t*));
-
-    PHY_vars_UE_g[UE_id]->ulsch_ue = (LTE_UE_ULSCH_t**) malloc16(NUMBER_OF_eNB_MAX*sizeof(LTE_UE_ULSCH_t*));
-
-    PHY_vars_UE_g[UE_id]->dlsch_ue_SI = (LTE_UE_DLSCH_t**) malloc16(NUMBER_OF_eNB_MAX*sizeof(LTE_UE_DLSCH_t*));
-    PHY_vars_UE_g[UE_id]->dlsch_ue_ra = (LTE_UE_DLSCH_t**) malloc16(NUMBER_OF_eNB_MAX*sizeof(LTE_UE_DLSCH_t*));
-    */
-
-    for (i=0; i<NB_CH_INST; i++) {
-      for (j=0; j<2; j++) {
-        PHY_vars_UE_g[UE_id]->dlsch_ue[i][j]  = new_ue_dlsch(1,8);
-
-        if (!PHY_vars_UE_g[UE_id]->dlsch_ue[i][j]) {
-          msg("Can't get ue dlsch structures\n");
-          exit(-1);
-        } else
-          msg("dlsch_ue[%d][%d] => %p\n",UE_id,i,PHY_vars_UE_g[UE_id]->dlsch_ue[i][j]);//navid
-      }
-
-
-      PHY_vars_UE_g[UE_id]->ulsch_ue[i]  = new_ue_ulsch(3);
-
-      if (!PHY_vars_UE_g[UE_id]->ulsch_ue[i]) {
-        msg("Can't get ue ulsch structures\n");
-        exit(-1);
-      }
-
-      PHY_vars_UE_g[UE_id]->dlsch_ue_SI[i]  = new_ue_dlsch(1,1);
-      PHY_vars_UE_g[UE_id]->dlsch_ue_ra[i]  = new_ue_dlsch(1,1);
-    }
-  }
-
-  // do the srs init
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-
-    PHY_vars_UE_g[UE_id]->SRS_parameters.Csrs = 2;
-    PHY_vars_UE_g[UE_id]->SRS_parameters.Bsrs = 0;
-    PHY_vars_UE_g[UE_id]->SRS_parameters.kTC = 0;
-    PHY_vars_UE_g[UE_id]->SRS_parameters.n_RRC = 0;
-
-    if (UE_id>=3) {
-      printf("This SRS config will only work for 3 users");
-      exit(-1);
-    }
-
-    PHY_vars_UE_g[UE_id]->SRS_parameters.Ssrs = UE_id+1;
-
-    for (eNB_id=0; eNB_id<NB_CH_INST; eNB_id++)
-      PHY_vars_eNb_g[eNB_id]->eNB_UE_stats[UE_id].SRS_parameters = PHY_vars_UE_g[UE_id]->SRS_parameters;
-  }
-
-  // set up the user connections for the link level simulations
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-
-    PHY_vars_UE_g[UE_id]->UE_mode[0] = PUSCH;
-    PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->crnti = 0xBEEF+UE_id;
-
-    for (eNB_id=0; eNB_id<NB_CH_INST; eNB_id++) {
-      PHY_vars_eNb_g[eNB_id]->eNB_UE_stats[UE_id].mode = PUSCH;
-      PHY_vars_eNb_g[eNB_id]->eNB_UE_stats[UE_id].crnti = 0xBEEF+UE_id;
-    }
-  }
-
-
-  //init_transport_channels(transmission_mode);
-  CCCH_alloc_pdu.type               = 0;
-  CCCH_alloc_pdu.vrb_type           = 0;
-  CCCH_alloc_pdu.rballoc            = CCCH_RB_ALLOC;
-  CCCH_alloc_pdu.ndi      = 1;
-  CCCH_alloc_pdu.mcs      = 1;
-  CCCH_alloc_pdu.harq_pid = 0;
-
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-    DLSCH_alloc_pdu2[UE_id].rah              = 0;
-    DLSCH_alloc_pdu2[UE_id].rballoc          = DLSCH_RB_ALLOC;
-    DLSCH_alloc_pdu2[UE_id].TPC              = 0;
-    DLSCH_alloc_pdu2[UE_id].dai              = 0;
-    DLSCH_alloc_pdu2[UE_id].harq_pid         = 0;
-    DLSCH_alloc_pdu2[UE_id].tb_swap          = 0;
-    DLSCH_alloc_pdu2[UE_id].mcs1             = mcs;
-    DLSCH_alloc_pdu2[UE_id].ndi1             = 1;
-    DLSCH_alloc_pdu2[UE_id].rv1              = 0;
-    // Forget second codeword
-    DLSCH_alloc_pdu2[UE_id].tpmi             = 5 ;  // precoding
-  }
-
-  // initialized channel descriptors
-  for (eNB_id=0; eNB_id<NB_CH_INST; eNB_id++) {
-    for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-
-      printf("[SIM] Initializing channel from eNB %d to UE %d\n",eNB_id,UE_id);
-      /*
-      eNB2UE[eNB_id][UE_id] = new_channel_desc(PHY_vars_eNb_g[eNB_id]->lte_frame_parms.nb_antennas_tx,
-                 PHY_vars_UE_g[UE_id]->lte_frame_parms.nb_antennas_rx,
-                 nb_taps,
-                 channel_length,
-                 amps,
-                 NULL,
-                 NULL,
-                 Td,
-                 BW,
-                 ricean_factor,
-                 aoa,
-                 forgetting_factor,
-                 maxDoppler,
-                 0,
-                 path_loss_dB[UE_id]);
-
-      UE2eNB[UE_id][eNB_id] = new_channel_desc(PHY_vars_UE_g[UE_id]->lte_frame_parms.nb_antennas_tx,
-                 PHY_vars_eNb_g[eNB_id]->lte_frame_parms.nb_antennas_rx,
-                 nb_taps,
-                 channel_length,
-                 amps,
-                 NULL,
-                 NULL,
-                 Td,
-                 BW,
-                 ricean_factor,
-                 aoa,
-                 forgetting_factor,
-                 maxDoppler,
-                 0,
-                 path_loss_dB[UE_id]);
-      */
-      eNB2UE[eNB_id][UE_id] = new_channel_desc_scm(PHY_vars_eNb_g[eNB_id]->lte_frame_parms.nb_antennas_tx,
-                              PHY_vars_UE_g[UE_id]->lte_frame_parms.nb_antennas_rx,
-                              SCM_C,
-                              BW,
-                              forgetting_factor,
-                              0,
-                              path_loss_dB[UE_id]);
-
-      UE2eNB[UE_id][eNB_id] = new_channel_desc_scm(PHY_vars_UE_g[UE_id]->lte_frame_parms.nb_antennas_tx,
-                              PHY_vars_eNb_g[eNB_id]->lte_frame_parms.nb_antennas_rx,
-                              SCM_C,
-                              BW,
-                              forgetting_factor,
-                              0,
-                              path_loss_dB[UE_id]);
-    }
-  }
-
-
-  // start TX
-
-  for (aa=0; aa<PHY_vars_eNb_g[0]->lte_frame_parms.nb_antennas_tx; aa++) {
-#ifdef IFFT_FPGA
-    memset(&PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][aa][0],0,
-           (PHY_vars_eNb_g[0]->lte_frame_parms.N_RB_DL*12)*(PHY_vars_eNb_g[0]->lte_frame_parms.symbols_per_tti)*sizeof(mod_sym_t));
-#else
-    memset(&PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][aa][0],0,
-           PHY_vars_eNb_g[0]->lte_frame_parms.ofdm_symbol_size*(PHY_vars_eNb_g[0]->lte_frame_parms.symbols_per_tti)*sizeof(mod_sym_t));
-#endif
-  }
-
-  if (1) {
-    for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-      if (DLSCH_alloc_pdu2[UE_id].tpmi == 5) {
-        PHY_vars_eNb_g[0]->eNB_UE_stats[UE_id].DL_pmi_single = (unsigned short)(taus()&0xffff);
-        //PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->pmi_alloc = PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->pmi_alloc;
-      } else {
-        PHY_vars_eNb_g[0]->eNB_UE_stats[UE_id].DL_pmi_single = 0;
-      }
-
-      generate_eNb_dlsch_params_from_dci(0,
-                                         &DLSCH_alloc_pdu2[UE_id],
-                                         PHY_vars_eNb_g[0]->eNB_UE_stats[UE_id].crnti,
-                                         format2_2A_M10PRB,
-                                         PHY_vars_eNb_g[0]->dlsch_eNb[UE_id],
-                                         &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                         SI_RNTI,
-                                         RA_RNTI,
-                                         P_RNTI,
-                                         PHY_vars_eNb_g[0]->eNB_UE_stats[UE_id].DL_pmi_single); //change this later
-
-      // DCI
-      memcpy(&dci_alloc[UE_id].dci_pdu[0],&DLSCH_alloc_pdu2[UE_id],sizeof(DCI2_5MHz_2A_M10PRB_TDD_t));
-      dci_alloc[UE_id].dci_length = sizeof_DCI2_5MHz_2A_M10PRB_TDD_t;
-      dci_alloc[UE_id].L          = 3;
-      dci_alloc[UE_id].rnti       = PHY_vars_eNb_g[0]->eNB_UE_stats[UE_id].crnti;
-      dci_alloc[UE_id].format     = format2_2A_M10PRB;
-      num_ue_spec_dci++;
-    }
-
-    num_pdcch_symbols = generate_dci_top(num_ue_spec_dci,
-                                         num_common_dci,
-                                         dci_alloc,
-                                         0,
-                                         1024,
-                                         &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                         PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                                         0);
-    printf("Num_pddch_symbols %d\n",num_pdcch_symbols);
-
-    for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-      // DLSCH
-      input_buffer_length = PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->TBS/8;
-
-      printf("UE %d: TBS      %d, Input buffer size %d bytes\n",UE_id,
-             PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->TBS,
-             input_buffer_length);
-
-      input_buffer = (unsigned char *)malloc(input_buffer_length+4);
-
-      for (i=0; i<input_buffer_length; i++)
-        input_buffer[i]= (unsigned char)(taus()&0xff);
-
-      dlsch_encoding(input_buffer,
-                     &PHY_vars_eNb_g[0]->lte_frame_parms,
-                     num_pdcch_symbols,
-                     PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]);
-
-      //#ifdef OUTPUT_DEBUG
-      for (s=0; s<PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->C; s++) {
-        if (s<PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->Cminus)
-          Kr = PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->Kminus;
-        else
-          Kr = PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->Kplus;
-
-        Kr_bytes = Kr>>3;
-
-        for (i=0; i<Kr_bytes; i++)
-          printf("%d : (%x)\n",i,PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]->harq_processes[0]->c[s][i]);
-      }
-
-      //#endif
-      //if (UE_id==0) {
-      re_allocated = dlsch_modulation(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                                      1024,
-                                      0,
-                                      &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                      num_pdcch_symbols,
-                                      PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][0]);
-
-
-      printf("RB count %d (%d,%d)\n",re_allocated,re_allocated/PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols/12,PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols);
-      //}
-
-
-      if (num_layers>1)
-        re_allocated = dlsch_modulation(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                                        1024,
-                                        0,
-                                        &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                        num_pdcch_symbols,
-                                        PHY_vars_eNb_g[0]->dlsch_eNb[UE_id][1]);
-    }
-  } else { // PBCH + DLSCH CNTL
-    generate_eNb_dlsch_params_from_dci(0,
-                                       &CCCH_alloc_pdu,
-                                       SI_RNTI,
-                                       format1A,
-                                       &PHY_vars_eNb_g[0]->dlsch_eNb_SI,
-                                       &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                       SI_RNTI,
-                                       RA_RNTI,
-                                       P_RNTI,
-                                       0);
-
-    memcpy(&dci_alloc[0].dci_pdu[0],&CCCH_alloc_pdu,sizeof(DCI1A_5MHz_TDD_1_6_t));
-    dci_alloc[0].dci_length = sizeof_DCI1A_5MHz_TDD_1_6_t;
-    dci_alloc[0].L          = 3;
-    dci_alloc[0].rnti       = SI_RNTI;
-    dci_alloc[0].format     = format1A;
-    num_common_dci++;
-
-    num_pdcch_symbols = generate_dci_top(num_ue_spec_dci,
-                                         num_common_dci,
-                                         dci_alloc,
-                                         0,
-                                         1024,
-                                         &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                         PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                                         0);
-    printf("Num_pddch_symbols %d\n",num_pdcch_symbols);
-
-    input_buffer_length = PHY_vars_eNb_g[0]->dlsch_eNb_SI->harq_processes[0]->TBS/8;
-    printf("Input buffer size %d bytes\n",input_buffer_length);
-
-    input_buffer = (unsigned char *)malloc(input_buffer_length+4);
-
-    for (i=0; i<input_buffer_length; i++)
-      input_buffer[i]= (unsigned char)(taus()&0xff);
-
-    dlsch_encoding(input_buffer,
-                   &PHY_vars_eNb_g[0]->lte_frame_parms,
-                   num_pdcch_symbols,
-                   PHY_vars_eNb_g[0]->dlsch_eNb_SI);
-
-#ifdef OUTPUT_DEBUG
-
-    for (s=0; s<PHY_vars_eNb_g[0]->dlsch_eNb_SI->harq_processes[0]->C; s++) {
-      if (s<PHY_vars_eNb_g[0]->dlsch_eNb_SI->harq_processes[0]->Cminus)
-        Kr = PHY_vars_eNb_g[0]->dlsch_eNb_SI->harq_processes[0]->Kminus;
-      else
-        Kr = PHY_vars_eNb_g[0]->dlsch_eNb_SI->harq_processes[0]->Kplus;
-
-      Kr_bytes = Kr>>3;
-
-      for (i=0; i<Kr_bytes; i++)
-        printf("%d : (%x)\n",i,PHY_vars_eNb_g[0]->dlsch_eNb_SI->harq_processes[0]->c[s][i]);
-    }
-
-#endif
-
-    re_allocated = dlsch_modulation(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                                    1024,
-                                    0,
-                                    &PHY_vars_eNb_g[0]->lte_frame_parms,
-                                    num_pdcch_symbols,
-                                    PHY_vars_eNb_g[0]->dlsch_eNb_SI);
-
-
-    printf("RB count %d (%d,%d)\n",re_allocated,re_allocated/PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols/12,PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols);
-
-    if ((re_allocated/(PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols*12)) != NB_RB)
-      printf("Bad RB count %d (%d,%d)\n",re_allocated,re_allocated/PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols/12,PHY_vars_eNb_g[0]->lte_frame_parms.num_dlsch_symbols);
-
-
-
-    generate_pss(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                 1024,
-                 &PHY_vars_eNb_g[0]->lte_frame_parms,
-                 sector_id,
-                 6-PHY_vars_eNb_g[0]->lte_frame_parms.Ncp,
-                 0);
-
-    for (i=0; i<6; i++)
-      pbch_pdu[i] = 0;
-
-    *((unsigned int*) pbch_pdu) = mac_xface->frame;
-    ((unsigned char*) pbch_pdu)[4] = transmission_mode;
-
-    generate_pbch(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                  1024,
-                  &PHY_vars_eNb_g[0]->lte_frame_parms,
-                  pbch_pdu,
-                  0);
-
-  }
-
-  generate_pilots(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id],
-                  1024,
-                  &PHY_vars_eNb_g[0]->lte_frame_parms,
-                  sector_id,
-                  LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
-
-#ifdef IFFT_FPGA
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsigF0.m","txsF0", PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[0][0],300*120,1,4);
-  write_output("txsigF1.m","txsF1", PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[0][1],300*120,1,4);
-#endif
-
-  // do table lookup and write results to txdataF2
-  for (aa=0; aa<PHY_vars_eNb_g[0]->lte_frame_parms.nb_antennas_tx; aa++) {
-    ind = 0;
-
-    for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX; i++)
-      if (((i%512)>=1) && ((i%512)<=150))
-        txdataF2[aa][i] = ((int*)mod_table)[PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][aa][ind++]];
-      else if ((i%512)>=362)
-        txdataF2[aa][i] = ((int*)mod_table)[PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][aa][ind++]];
-      else
-        txdataF2[aa][i] = 0;
-
-    //    printf("ind=%d\n",ind);
-  }
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsigF20.m","txsF20", txdataF2[0],FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX,1,1);
-#endif
-
-  tx_lev = 0;
-
-  for (aa=0; aa<PHY_vars_eNb_g[0]->lte_frame_parms.nb_antennas_tx; aa++) {
-    PHY_ofdm_mod(txdataF2[aa],        // input
-                 txdata[aa],         // output
-                 PHY_vars_eNb_g[0]->lte_frame_parms.log2_symbol_size,                // log2_fft_size
-                 NUMBER_OF_SYMBOLS_PER_FRAME,                 // number of symbols
-                 PHY_vars_eNb_g[0]->lte_frame_parms.nb_prefix_samples,               // number of prefix samples
-                 PHY_vars_eNb_g[0]->lte_frame_parms.twiddle_ifft,  // IFFT twiddle factors
-                 PHY_vars_eNb_g[0]->lte_frame_parms.rev,           // bit-reversal permutation
-                 CYCLIC_PREFIX);
-
-    tx_lev += signal_energy(&txdata[aa][4*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES],
-                            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-  }
-
-#else //IFFT_FPGA
-
-  txdata = PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdata[sector_id];
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsigF0.m","txsF0", PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][0],FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX/5,1,1);
-  //write_output("txsigF1.m","txsF1", PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][1],FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX/5,1,1);
-#endif
-
-  tx_lev = 0;
-
-  for (aa=0; aa<PHY_vars_eNb_g[0]->lte_frame_parms.nb_antennas_tx; aa++) {
-    PHY_ofdm_mod(PHY_vars_eNb_g[0]->lte_eNB_common_vars.txdataF[sector_id][aa],        // input
-                 txdata[aa],         // output
-                 PHY_vars_eNb_g[0]->lte_frame_parms.log2_symbol_size,                // log2_fft_size
-                 NUMBER_OF_SYMBOLS_PER_FRAME,                 // number of symbols
-                 PHY_vars_eNb_g[0]->lte_frame_parms.nb_prefix_samples,               // number of prefix samples
-                 PHY_vars_eNb_g[0]->lte_frame_parms.twiddle_ifft,  // IFFT twiddle factors
-                 PHY_vars_eNb_g[0]->lte_frame_parms.rev,           // bit-reversal permutation
-                 CYCLIC_PREFIX);
-
-    tx_lev += signal_energy(&txdata[aa][OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*4],
-                            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-
-  }
-
-#endif //IFFT_FPGA
-
-
-  printf("tx_lev = %d\n",tx_lev);
-  tx_lev_dB = (unsigned int) dB_fixed(tx_lev);
-  printf("tx_lev_dB = %d\n",tx_lev_dB);
-
-
-#ifdef OUTPUT_DEBUG
-  write_output("txsig0.m","txs0", txdata[0],FRAME_LENGTH_COMPLEX_SAMPLES,1,1);
-#endif
-
-
-  for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES; i++) {
-    for (aa=0; aa<PHY_vars_eNb_g[0]->lte_frame_parms.nb_antennas_tx; aa++) {
-      s_re[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)]);
-      s_im[aa][i] = ((double)(((short *)txdata[aa]))[(i<<1)+1]);
-    }
-  }
-
-
-
-  for (ch_realization=0; ch_realization<1; ch_realization++) {
-
-    printf("[SIM]**********************Channel Realization Index = %d **************************\n", ch_realization);
-
-    for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-
-      PHY_vars_UE_g[UE_id]->lte_ue_pbch_vars[0]->pdu_errors_conseq=0;
-      PHY_vars_UE_g[UE_id]->lte_ue_pbch_vars[0]->pdu_errors=0;
-
-      PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->dci_errors = 0;
-      PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->dci_missed = 0;
-      PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->dci_false  = 0;
-      PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->dci_received = 0;
-
-      PHY_vars_UE_g[UE_id]->dlsch_errors[0] = 0;
-      PHY_vars_UE_g[UE_id]->dlsch_errors_last[0] = 0;
-      PHY_vars_UE_g[UE_id]->dlsch_received[0] = 0;
-      PHY_vars_UE_g[UE_id]->dlsch_received_last[0] = 0;
-      PHY_vars_UE_g[UE_id]->dlsch_fer[0] = 0;
-      PHY_vars_UE_g[UE_id]->dlsch_SI_errors[0] = 0;
-      PHY_vars_UE_g[UE_id]->dlsch_ra_errors[0] = 0;
-
-      PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->num_pdcch_symbols = num_pdcch_symbols;
-
-#ifdef AWGN // copy s_re and s_im to r_re and r_im
-
-      for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES; i++) {
-        for (aa=0; aa<PHY_vars_eNb_g[0]->lte_frame_parms.nb_antennas_tx; aa++) {
-          r_re[UE_id][aa][i] = s_re[aa][i];
-          r_im[UE_id][aa][i] = s_im[aa][i];
-        }
-      }
-
-#else
-      multipath_channel(eNB2UE[0][UE_id],s_re,s_im,r_re[UE_id],r_im[UE_id],
-                        FRAME_LENGTH_COMPLEX_SAMPLES,
-                        0);
-#endif
-
-#ifdef OUTPUT_DEBUG
-      write_output("channel0.m","chan0",eNB2UE[0][UE_id]->ch[0],channel_length,1,8);
-#endif
-    } //UE_id
-
-    //for (SNR=snr0;SNR<snr1;SNR+=.2) {
-    SNR = snr0;
-
-    sigma2_dB = 10*log10(tx_lev) + 10*log10(frame_parms->ofdm_symbol_size/(NB_RB*12)) - SNR;
-    sigma2 = pow(10,sigma2_dB/10);
-
-    printf("[SIM] SNR = %f dB (tx_lev %f, sigma2_dB %f)\n",
-           SNR,
-           (double)10*log10(tx_lev)+10*log10(frame_parms->ofdm_symbol_size/(NB_RB*12)),
-           sigma2_dB);
-
-    for (trials = 0; trials<n_frames; trials++) {
-      mac_xface->frame = trials;
-
-      for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-        PHY_vars_UE_g[UE_id]->UE_mode[0] = PUSCH;
-        PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->crnti = 0xBEEF+UE_id;
-        PHY_vars_UE_g[UE_id]->ulsch_no_allocation_counter[0] = 0;         //so we don't go out of PUSCH mode
-        PHY_vars_UE_g[UE_id]->lte_ue_pbch_vars[0]->pdu_errors_conseq = 0; //so we don't go out of PUSCH mode
-
-        // AWGN
-        for (i=0; i<FRAME_LENGTH_COMPLEX_SAMPLES; i++) {
-          if ((i/640)%3!=0) {
-            for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
-              ((short*) PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[aa])[2*i] = (short) (r_re[UE_id][aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0));
-              ((short*) PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[aa])[2*i+1] = (short) (r_im[UE_id][aa][i] + sqrt(sigma2/2)*gaussdouble(0.0,1.0));
-            }
-          } else {
-            for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
-              ((short*) PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[aa])[2*i] = (short) (r_re[UE_id][aa][i]);
-              ((short*) PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[aa])[2*i+1] = (short) (r_im[UE_id][aa][i]);
-            }
-          }
-        }
-
-        //    lte_sync_time_init(lte_frame_parms,lte_ue_common_vars);
-        //    lte_sync_time(lte_ue_common_vars->rxdata, lte_frame_parms);
-        //    lte_sync_time_free();
-
-        /*
-        // optional: read rx_frame from file
-        if ((rx_frame_file = fopen("rx_frame.dat","r")) == NULL)
-        {
-        printf("Cannot open rx_frame.m data file\n");
-        exit(0);
-        }
-
-        result = fread((void *)PHY_vars->rx_vars[0].RX_DMA_BUFFER,4,FRAME_LENGTH_COMPLEX_SAMPLES,rx_frame_file);
-        printf("Read %d bytes\n",result);
-        result = fread((void *)PHY_vars->rx_vars[1].RX_DMA_BUFFER,4,FRAME_LENGTH_COMPLEX_SAMPLES,rx_frame_file);
-        printf("Read %d bytes\n",result);
-
-        fclose(rx_frame_file);
-        */
-
-        rx_lev_data_sym = signal_energy(&PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[0][OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*4],OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-        rx_lev_null_sym = signal_energy(&PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[0][13*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES],OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-        rx_snr_dB = dB_fixed(rx_lev_data_sym - rx_lev_null_sym) - dB_fixed(rx_lev_null_sym);
-#ifdef OUTPUT_DEBUG
-        printf("RX level in data symbol (lin) %d\n",rx_lev_data_sym);
-        printf("RX level in null symbol (lin) %d\n",rx_lev_null_sym);
-        printf("RX SNR (dB) %d\n",rx_snr_dB);
-#endif
-
-        phy_procedures_UE_RX(0,PHY_vars_UE_g[UE_id],0);
-        phy_procedures_UE_RX(1,PHY_vars_UE_g[UE_id],0);
-        phy_procedures_UE_RX(2,PHY_vars_UE_g[UE_id],0);
-
-        if(trials==0) {
-          fprintf(csv_fd,"%f,%d,%d,%d",SNR, rx_lev_data_sym , rx_lev_null_sym, rx_snr_dB);
-          data= &(PHY_vars_UE_g[UE_id]->lte_ue_common_vars.dl_ch_estimates[sector_id][0][0]);
-
-          for (ii=10; ii<((1*(PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size))<<1)-414; ii+=2) {
-            fprintf(csv_fd,",%d+1i*(%d)",((short *)data)[ii], ((short *)data)[ii+1]);
-          }
-
-          fprintf(csv_fd,",");
-        }
-
-#ifdef OUTPUT_DEBUG
-
-        if(trials==0) {
-          write_output("rxsig0.m","rxs0", PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdata[0],FRAME_LENGTH_COMPLEX_SAMPLES,1,1);
-          write_output("dlsch00_ch0.m","dl00_ch0",&(PHY_vars_UE_g[UE_id]->lte_ue_common_vars.dl_ch_estimates[sector_id][0][0]),(6*(PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size)),1,1);
-          write_output("dlsch01_ch0.m","dl01_ch0",&(PHY_vars_UE_g[UE_id]->lte_ue_common_vars.dl_ch_estimates[sector_id][1][0]),(6*(PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size)),1,1);
-          write_output("dlsch10_ch0.m","dl10_ch0",&(PHY_vars_UE_g[UE_id]->lte_ue_common_vars.dl_ch_estimates[sector_id][2][0]),(6*(PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size)),1,1);
-          write_output("dlsch11_ch0.m","dl11_ch0",&(PHY_vars_UE_g[UE_id]->lte_ue_common_vars.dl_ch_estimates[sector_id][3][0]),(6*(PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size)),1,1);
-          write_output("rxsigF0.m","rxsF0", PHY_vars_UE_g[UE_id]->lte_ue_common_vars.rxdataF[0],2*12*PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size,2,1);
-          write_output("rxsigF0_ext.m","rxsF0_ext", PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->rxdataF_ext[0],2*12*PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size,1,1);
-          write_output("dlsch00_ch0_ext.m","dl00_ch0_ext",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->dl_ch_estimates_ext[0],300*12,1,1);
-          write_output("pdcchF0_ext.m","pdcchF_ext", PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[sector_id]->rxdataF_ext[0],2*3*PHY_vars_UE_g[UE_id]->lte_frame_parms.ofdm_symbol_size,1,1);
-          write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[sector_id]->dl_ch_estimates_ext[0],300*3,1,1);
-          write_output("dlsch01_ch0_ext.m","dl01_ch0_ext",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->dl_ch_estimates_ext[1],300*12,1,1);
-          write_output("dlsch10_ch0_ext.m","dl10_ch0_ext",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->dl_ch_estimates_ext[2],300*12,1,1);
-          write_output("dlsch11_ch0_ext.m","dl11_ch0_ext",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->dl_ch_estimates_ext[3],300*12,1,1);
-          write_output("dlsch_rho.m","dl_rho",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->rho[0],300*12,1,1);
-          write_output("dlsch_rxF_comp0.m","dlsch0_rxF_comp0",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->rxdataF_comp[0],300*12,1,1);
-          write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[sector_id]->rxdataF_comp[0],4*300,1,1);
-          write_output("dlsch_rxF_llr.m","dlsch_llr",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->llr[0],coded_bits_per_codeword,1,0);
-          write_output("pdcch_rxF_llr.m","pdcch_llr",PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[sector_id]->llr,2400,1,4);
-
-          write_output("dlsch_mag1.m","dlschmag1",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->dl_ch_mag,300*12,1,1);
-          write_output("dlsch_mag2.m","dlschmag2",PHY_vars_UE_g[UE_id]->lte_ue_dlsch_vars[sector_id]->dl_ch_magb,300*12,1,1);
-        }
-
-#endif //OUTPUT_DEBUG
-
-      }   //UE_id
-
-      //} //SNR
-    } //trials
-
-    for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-      printf("[SIM] UE %d: Errors %d/%d, Pe = %e, dci_errors %d/%d, Pe = %e\n",UE_id,
-             PHY_vars_UE_g[UE_id]->dlsch_errors[0],PHY_vars_UE_g[UE_id]->dlsch_received[0],
-             (double)PHY_vars_UE_g[UE_id]->dlsch_errors[0]/PHY_vars_UE_g[UE_id]->dlsch_received[0],
-             PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->dci_errors,1+trials,
-             (double)PHY_vars_UE_g[UE_id]->lte_ue_pdcch_vars[0]->dci_errors/(trials+1));
-      blerr= (double)errs/(trials+1);
-      fprintf(bler_fd,"%f,%e;\n",SNR,blerr);
-      fprintf(csv_fd,"%e;\n",blerr);
-    }
-  } // Channel Realizations
-
-  fprintf(bler_fd,"];");
-  fprintf(csv_fd,"];");
-  fclose(bler_fd);
-  fclose(csv_fd);
-
-  /*
-    printf("Freeing dlsch structures\n");
-    for (i=0;i<2;i++) {
-    printf("eNb %d\n",i);
-    free_eNb_dlsch(PHY_vars_eNb_g[0]->dlsch_eNb[i]);
-    printf("UE %d\n",i);
-    free_ue_dlsch(PHY_vars_UE->dlsch_ue[i]);
-    }
-  */
-
-
-#ifdef IFFT_FPGA
-  printf("Freeing transmit signals\n");
-  free(txdataF2[0]);
-  free(txdataF2[1]);
-  free(txdataF2);
-  free(txdata[0]);
-  free(txdata[1]);
-  free(txdata);
-#endif
-
-  printf("Freeing channel I/O\n");
-
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
-    for (i=0; i<2; i++) {
-      free(r_re[UE_id][i]);
-      free(r_im[UE_id][i]);
-    }
-
-    free(r_re[UE_id]);
-    free(r_im[UE_id]);
-  }
-
-  for (i=0; i<2; i++) {
-    free(s_re[i]);
-    free(s_im[i]);
-  }
-
-  free(s_re);
-  free(s_im);
-  free(r_re);
-  free(r_im);
-  // }
-  //  lte_sync_time_free();
-
-  return(0);
-}
-
-
-