Index: external/Hector/H_EllipticAperture.cc
===================================================================
--- external/Hector/H_EllipticAperture.cc	(revision 5b822e567e81b047f743b282d78eaae9b7c4fb20)
+++ external/Hector/H_EllipticAperture.cc	(revision 64a49502a612569581d1b8c14620c9a50b74ac1e)
@@ -1,19 +1,12 @@
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  A fast simulator --<--<--     *
-*                 / --<--<--     of particle   --<--<--     *
-*  ----HECTOR----<                                          *
-*                 \ -->-->-- transport through -->-->--     *
-*                   -->-->-- generic beamlines -->-->--     *
-*                                                           *
-* JINST 2:P09005 (2007)                                     *
-*      X Rouby, J de Favereau, K Piotrzkowski (CP3)         *
-*       http://www.fynu.ucl.ac.be/hector.html               *
-*                                                           *
-* Center for Cosmology, Particle Physics and Phenomenology  *
-*              Universite catholique de Louvain             *
-*                 Louvain-la-Neuve, Belgium                 *
- *                                                         *
-   * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+---- Hector the simulator ----
+   A fast simulator of particles through generic beamlines.
+   J. de Favereau, X. Rouby ~~~ hector_devel@cp3.phys.ucl.ac.be
+
+        http://www.fynu.ucl.ac.be/hector.html
+
+   Centre de Physique des Particules et de PhÃ©nomÃ©nologie (CP3)
+   UniversitÃ© Catholique de Louvain (UCL)
+*/
 
 /// \file H_EllipticAperture.cc
@@ -24,5 +17,5 @@
 
 // ROOT #includes
-#include "TEllipse.h"
+//#include "TEllipse.h"
 
 // local #includes
@@ -32,26 +25,7 @@
 using namespace std;
 
-H_EllipticAperture::H_EllipticAperture(const int type, const float l, const float h, const float posx, const float posy) :
-	H_Aperture(type,l,h,0,0,posx,posy) {
-        /// @param type is the aperture type (ELLIPTIC or CIRCULAR)
-        /// @param l, h are the length and height of the elliptic shape
+H_EllipticAperture::H_EllipticAperture(const float x1, const float x2, const float posx, const float posy) :H_Aperture(ELLIPTIC,x1,x2,0,0,posx,posy) {
+        /// @param x1, x2 are the length and height of the elliptic shape
         /// @param posx, posy are the (x,y) coordinates of the center of the ellipse
-
-	if (type!= ELLIPTIC && type != CIRCULAR) { 
-		cout << "Warning: trying to define an EllipticalAperture which is neither elliptical nor circular." << endl;
-		cout << "'Elliptical' type forced\n"; 
-		type_ = ELLIPTIC; 
-		aptypestring = getApertureString(); 
-	}
-}
-
-H_EllipticAperture::H_EllipticAperture(const float l, const float h, const float posx, const float posy) :
-	H_Aperture(ELLIPTIC,l,h,0,0,posx,posy) {
-        /// @param l, h are the length and height of the elliptic shape
-        /// @param posx, posy are the (x,y) coordinates of the center of the ellipse
-}
-
-H_EllipticAperture* H_EllipticAperture::clone() const {
-	return new H_EllipticAperture(x1,x2,fx,fy);
 }
 
@@ -61,16 +35,17 @@
 }
 
-void H_EllipticAperture::draw(const float scale) const {
-	TEllipse* te = new TEllipse(fx*scale,fy*scale,x1*scale,x2*scale);
+void H_EllipticAperture::draw() const {
+/* 	Ellipse* te = new TEllipse(fx,fy,x1,x2);
 	te->SetFillStyle(3003);
-	te->SetLineColor(39);
-	te->SetFillColor(39);
-	te->Draw("f");
+	te->SetLineColor(2);
+	te->SetFillColor(2);
+	te->Draw();
+	return;
+*/
+}
+
+void H_EllipticAperture::printProperties() const {
+	cout<< "Aperture shape:" << getTypeString() << ", ellipse axes : "<<x1<<", "<<x2<<endl;
+	cout << " \t Center : " << fx << "," << fy << endl;
 	return;
 }
-
-std::ostream& operator<< (std::ostream& os, const H_EllipticAperture& ap) {
-	os<< "Aperture shape:" << ap.aptypestring << ", ellipse axes : "<< ap.x1 <<", " << ap.x2 << endl;
-	os << " \t Center : "  << ap.fx << "," << ap.fy << endl;
-	return os;
-}
