Transition to NewIO

[u/mrichter/AliRoot.git] / ITS / AliITSgeomSPD.cxx

diff --git a/ITS/AliITSgeomSPD.cxx b/ITS/AliITSgeomSPD.cxx
index 5517066d30564cff10039c116db608b97ab78d19..d9a3850224763825acea4d03a058af2f1aa89c4f 100644 (file)
--- a/ITS/AliITSgeomSPD.cxx
+++ b/ITS/AliITSgeomSPD.cxx
@@ -13,33 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.12  2001/08/24 21:06:37  nilsen
-Added more documentation, fixed up some coding violations, and some
-forward declorations.
-
-Revision 1.11  2001/05/16 08:17:49  hristov
-Bug fixed in the StepManager to account for the difference in the geometry 
-tree for the ITS pixels. This fixes both the funny distribution of pixel 
-coordinates and the missing hits/digits/points in many sectors of the ITS 
-pixel barrel. Also included is a patch to properly get and use the detector 
-dimensions through out the ITS code. (B.Nilsen)
-
-Revision 1.10  2001/04/26 22:44:34  nilsen
-Bug fix.
-
-Revision 1.9  2001/02/09 00:00:57  nilsen
-Fixed compatibility problem with HP unix {ios::fmtflags -> Int_t}. Fixed
-bugs in iostream based streamers used to read and write .det files. Fixed
-some detector sizes. Fixed bugs in some default-special constructors.
-
-Revision 1.8  2001/02/03 00:00:30  nilsen
-New version of AliITSgeom and related files. Now uses automatic streamers,
-set up for new formatted .det file which includes detector information.
-Additional smaller modifications are still to come.
-
-*/
+/* $Id$ */
 
 ////////////////////////////////////////////////////////////////////////
 // This class is for the Silicon Pixel Detector, SPD, specific geometry.
@@ -48,8 +22,7 @@ Additional smaller modifications are still to come.
 // initilize this one with predefined values.
 ////////////////////////////////////////////////////////////////////////
 
-#include <iostream.h>
-#include <iomanip.h>
+#include <Riostream.h>
 #include <TShape.h>
 #include <TMath.h>
 
@@ -184,9 +157,13 @@ void AliITSgeomSPD::Print(ostream *os) const {
 #else
     Int_t fmt;
 #endif
+#else
+#if defined __ICC || defined __ECC
+    ios::fmtflags fmt;
 #else
     Int_t fmt;
-#endif;
+#endif
+#endif
 
     fmt = os->setf(ios::scientific); // set scientific floating point output
     *os << "TBRIK" << " ";
@@ -242,47 +219,6 @@ istream &operator>>(istream &is,AliITSgeomSPD &r){
 }
 //=====================================================================
 
-/*
-$Log$
-Revision 1.12  2001/08/24 21:06:37  nilsen
-Added more documentation, fixed up some coding violations, and some
-forward declorations.
-
-Revision 1.11  2001/05/16 08:17:49  hristov
-Bug fixed in the StepManager to account for the difference in the geometry tree for the ITS pixels. This fixes both the funny distribution of pixel coordinates and the missing hits/digits/points in many sectors of the ITS pixel barrel. Also included is a patch to properly get and use the detector dimensions through out the ITS code. (B.Nilsen)
-
-Revision 1.10  2001/04/26 22:44:34  nilsen
-Bug fix.
-
-Revision 1.9  2001/02/09 00:00:57  nilsen
-Fixed compatibility problem with HP unix {ios::fmtflags -> Int_t}. Fixed
-bugs in iostream based streamers used to read and write .det files. Fixed
-some detector sizes. Fixed bugs in some default-special constructors.
-
-Revision 1.8  2001/02/03 00:00:30  nilsen
-New version of AliITSgeom and related files. Now uses automatic streamers,
-set up for new formatted .det file which includes detector information.
-Additional smaller modifications are still to come.
-
-Revision 1.7  2000/10/02 16:32:35  barbera
-Forward declaration added
-
-Revision 1.1.2.8  2000/10/02 15:52:05  barbera
-Forward declaration added
-
-Revision 1.6  2000/07/10 16:07:18  fca
-Release version of ITS code
-
-Revision 1.4  2000/06/10 20:34:37  nilsen
-Fixed compilation warning with HP unix.
-
-Revision 1.3  2000/06/10 10:43:04  nilsen
-Fixed bug in copy and operator =.
-
-*/
-
-//#include "AliITSgeomSPD300.h"
-
 ClassImp(AliITSgeomSPD300)
 
 AliITSgeomSPD300::AliITSgeomSPD300() : AliITSgeomSPD(){
@@ -346,47 +282,6 @@ istream &operator>>(istream &is,AliITSgeomSPD300 &r){
     return is;
 }
 //=====================================================================
-/*
-$Log$
-Revision 1.12  2001/08/24 21:06:37  nilsen
-Added more documentation, fixed up some coding violations, and some
-forward declorations.
-
-Revision 1.11  2001/05/16 08:17:49  hristov
-Bug fixed in the StepManager to account for the difference in the geometry tree for the ITS pixels. This fixes both the funny distribution of pixel coordinates and the missing hits/digits/points in many sectors of the ITS pixel barrel. Also included is a patch to properly get and use the detector dimensions through out the ITS code. (B.Nilsen)
-
-Revision 1.10  2001/04/26 22:44:34  nilsen
-Bug fix.
-
-Revision 1.9  2001/02/09 00:00:57  nilsen
-Fixed compatibility problem with HP unix {ios::fmtflags -> Int_t}. Fixed
-bugs in iostream based streamers used to read and write .det files. Fixed
-some detector sizes. Fixed bugs in some default-special constructors.
-
-Revision 1.8  2001/02/03 00:00:30  nilsen
-New version of AliITSgeom and related files. Now uses automatic streamers,
-set up for new formatted .det file which includes detector information.
-Additional smaller modifications are still to come.
-
-Revision 1.7  2000/10/02 16:32:35  barbera
-Forward declaration added
-
-Revision 1.1.2.8  2000/10/02 15:52:05  barbera
-Forward declaration added
-
-Revision 1.6  2000/07/10 16:07:18  fca
-Release version of ITS code
-
-Revision 1.4  2000/06/10 20:34:22  nilsen
-Fixed compilation warning with HP unix.
-
-Revision 1.3  2000/06/10 10:42:49  nilsen
-Fixed bug in copy and operator =.
-
-
-*/
-
-//#include "AliITSgeomSPD425Short.h"
 
 ClassImp(AliITSgeomSPD425Short)
 
@@ -480,48 +375,6 @@ istream &operator>>(istream &is,AliITSgeomSPD425Short &r){
 }
 //======================================================================
 
-/*
-$Log$
-Revision 1.12  2001/08/24 21:06:37  nilsen
-Added more documentation, fixed up some coding violations, and some
-forward declorations.
-
-Revision 1.11  2001/05/16 08:17:49  hristov
-Bug fixed in the StepManager to account for the difference in the geometry tree for the ITS pixels. This fixes both the funny distribution of pixel coordinates and the missing hits/digits/points in many sectors of the ITS pixel barrel. Also included is a patch to properly get and use the detector dimensions through out the ITS code. (B.Nilsen)
-
-Revision 1.10  2001/04/26 22:44:34  nilsen
-Bug fix.
-
-Revision 1.9  2001/02/09 00:00:57  nilsen
-Fixed compatibility problem with HP unix {ios::fmtflags -> Int_t}. Fixed
-bugs in iostream based streamers used to read and write .det files. Fixed
-some detector sizes. Fixed bugs in some default-special constructors.
-
-Revision 1.8  2001/02/03 00:00:30  nilsen
-New version of AliITSgeom and related files. Now uses automatic streamers,
-set up for new formatted .det file which includes detector information.
-Additional smaller modifications are still to come.
-
-Revision 1.7  2000/10/02 16:32:35  barbera
-Forward declaration added
-
-Revision 1.1.2.8  2000/10/02 15:52:05  barbera
-Forward declaration added
-
-Revision 1.6  2000/07/10 16:07:18  fca
-Release version of ITS code
-
-Revision 1.4  2000/06/10 20:34:22  nilsen
-Fixed compilation warning with HP unix.
-
-Revision 1.3  2000/06/10 10:42:49  nilsen
-Fixed bug in copy and operator =.
-
-
-*/
-
-//#include "AliITSgeomSPD425Long.h"
-
 ClassImp(AliITSgeomSPD425Long)
 
 AliITSgeomSPD425Long::AliITSgeomSPD425Long(){