--- calo/flight/CaloProfile/src/CaloProfile.cpp	2009/06/24 14:12:55	1.6
+++ calo/flight/CaloProfile/src/CaloProfile.cpp	2009/08/04 15:05:21	1.7
@@ -742,13 +742,29 @@
     xpos = (st - mmin) * X0pl;
     if ( st > mmin && st < mmax ){      
       if ( no18x && ( st == 18+1 || st == mask18b+1 )){
-	enemip = 2. * eplane[1][st]; 
+	if ( !maskYO ){
+	  enemip = 2. * eplane[1][st]; 
+	} else {
+	  enemip = eplane[1][st]; 
+	};
       } else {
 	enemip = eplane[0][st-1] + eplane[1][st]; 
       };
     } else {
-      if ( st == mmin ) enemip = 2. * eplane[1][st]; 
-      if ( st == mmax ) enemip = 2. * eplane[0][st-1]; 
+      if ( st == mmin ){
+	if ( !maskYE ){
+	  enemip = 2. * eplane[1][st]; 
+	} else {
+	  enemip = eplane[1][st]; 
+	};
+      };
+      if ( st == mmax ){
+	if ( !maskXE ){
+	  enemip = 2. * eplane[0][st-1]; 
+	} else {
+	  enemip = eplane[0][st-1]; 
+	};
+      };
     };
     //
     qtotparz += enemip;