Changeset 111 in svn

Timestamp:

Dec 24, 2008, 11:08:53 AM (16 years ago)

Author:

severine ovyn

Message:

* empty log message *

File:

• trunk/Utilities/FROG/Includes/FROG/FROG_Element_Primitive_Cone.h (modified) (6 diffs)

trunk/Utilities/FROG/Includes/FROG/FROG_Element_Primitive_Cone.h

@@ -8 +8 @@
         float Radius;            
         float PosX;                     float PosY;    float PosZ;      
-        float LengthX;          float LengthY; float LengthZ;
-        unsigned short NPhi;unsigned char Endcap; 
+        float LengthX;          float LengthY; float LengthZ; int Side;
+        unsigned short NPhi;unsigned char Endcap;  
         FROG_Objects*  frogObjects_;
         
         virtual bool isCompactible(){ return true; }
 
-        static unsigned int sizeOf(){ return FROG_Element_Base_With_DetId::sizeOf() + 7*sizeof(float) + sizeof(unsigned short) + sizeof(unsigned char);}
+        static unsigned int sizeOf(){ return FROG_Element_Base_With_DetId::sizeOf() + 7*sizeof(float) + sizeof(int) + sizeof(unsigned short) + sizeof(unsigned char);}
 
         FROG_Element_Primitive_Cone(
         unsigned int detId,     float radius,
         float posX,                     float posY,    float posZ,
-        float lengthX,          float lengthY, float lengthZ,
+        float lengthX,          float lengthY, float lengthZ, int side,
         unsigned short nPhi=10, unsigned char endcap=0) :
         FROG_Element_Base_With_DetId(C_PRIMITIVE_CONE,detId),   
         Radius(radius),
-        PosX(posX),                     PosY(posY),                     PosZ(posZ),
-        LengthX(lengthX),       LengthY(lengthY),       LengthZ(lengthZ),
+        PosX(posX),                     PosY(posY),                     PosZ(posZ), 
+        LengthX(lengthX),       LengthY(lengthY),       LengthZ(lengthZ), Side(side),
         NPhi(nPhi), Endcap(endcap)
         {    
@@ -41 +41 @@
                 fread(&LengthY          ,sizeof(LengthY)         ,1,pFile);
                 fread(&LengthZ          ,sizeof(LengthZ)         ,1,pFile);
+                fread(&Side             ,sizeof(Side)            ,1,pFile);
                 fread(&NPhi             ,sizeof(NPhi)            ,1,pFile);             
                 fread(&Endcap           ,sizeof(Endcap)          ,1,pFile);             
@@ -56 +57 @@
                 data_ = FillBuffer( data_, &LengthY,                    sizeof(LengthY));
                 data_ = FillBuffer( data_, &LengthZ,                    sizeof(LengthZ));
+                data_ = FillBuffer( data_, &Side,                       sizeof(Side));
                 data_ = FillBuffer( data_, &NPhi,                               sizeof(NPhi));          
                 data_ = FillBuffer( data_, &Endcap,                             sizeof(Endcap));                
@@ -81 +83 @@
                 glRotatef(rotTheta,1,0,0);
                 double theta=atan(L/Radius);
+                if(Side==1){
                 glBegin (GL_QUADS);                     
                         for(double phi=0; phi<=6.2831;phi+=dphi){       
@@ -104 +107 @@
 
                 if(Endcap<2){// we have to draw internal face because cylinder is open
-                        glBegin (GL_TRIANGLES); 
-                        for(double phi=0; phi<=6.2831;phi+=dphi){       
-                                glNormal3f (0,0,-1);
-                                glVertex3f (Radius*cos(phi+dphi) ,Radius*sin(phi+dphi)  , L*0.5);       // ENDCAP1 INNER FACE
-                                glVertex3f (Radius*cos(phi)              ,Radius*sin(phi)               , L*0.5);
-                                glVertex3f (0                                    ,0                                             , L*0.5);
-                        }
-                        glEnd(); 
 
                         glBegin (GL_QUADS);                     
@@ -124 +119 @@
                 }
                 glPopMatrix();
+                }
+                else{
+                glBegin (GL_QUADS);
+                        for(double phi=0; phi<=6.2831;phi+=dphi){
+                                glNormal3f (       cos(phi)      ,sin(phi)              ,0);
+                                glVertex3f (0,0  ,-L*0.5);               // BARREL OUTER FACE
+                                glVertex3f (0,0  ,-L*0.5);
+                                glVertex3f (Radius*cos(phi)      ,Radius*sin(phi)       , L*0.5);
+                                glVertex3f (Radius*cos(phi+dphi) ,Radius*sin(phi+dphi)  , L*0.5);
+                        }
+                glEnd();
+
+
+                if(Endcap>1){
+                        for(double phi=0; phi<=6.2831;phi+=dphi){
+                                glNormal3f (0,0,-1);
+                                glVertex3f (Radius*cos(phi+dphi) ,Radius*sin(phi+dphi)  , -L*-0.5);       // ENDCAP1 INNER FACE
+                                glVertex3f (Radius*cos(phi)              ,Radius*sin(phi)               , -L*-0.5);
+                                glVertex3f (0                                    ,0                                             , -L*-0.5);
+                        }
+                }
+                glEnd();
+
+
+                if(Endcap<2){// we have to draw internal face because cylinder is open
+
+                        glBegin (GL_QUADS);
+                                for(double phi=0; phi<=6.2831;phi+=dphi){
+                                        glNormal3f (      -cos(phi)      ,-      sin(phi)       ,0);
+                                        glVertex3f (0,0               ,-L*0.5);               // BARREL OUTER FACE
+                                        glVertex3f (Radius*cos(phi)              ,Radius*sin(phi)      , L*0.5);
+                                        glVertex3f (Radius*cos(phi+dphi) ,Radius*sin(phi+dphi) , L*0.5);
+                                        glVertex3f (0,0 ,-L*0.5);
+                                }
+                        glEnd();
+                }
+                glPopMatrix();
+                }
+
         }
         #endif