Changeset 100 in svn for trunk/Utilities/FROG/Includes

Timestamp:

Dec 18, 2008, 2:39:26 PM (16 years ago)

Author:

severine ovyn

Message:

Remove datacard bug + CaloTowers OK

Location:

trunk/Utilities/FROG/Includes/FROG

Files:

• FROG_Chunk.h (modified) (1 diff)
• FROG_Element_Tools.cpp (modified) (1 diff)
• FROG_Element_Tools.h (modified) (1 diff)

trunk/Utilities/FROG/Includes/FROG/FROG_Chunk.h

@@ -114 +114 @@
 #define C_PRIMITIVE_PARTIALSPHERE       41031   // Contains a sphere
 #define C_PRIMITIVE_CYLINDER            41040   // Contains a cylinder
+#define C_PRIMITIVE_CONE                41080   // Contains a cylinder
 
 #define C_PRIMITIVE_SURFACE                     42000   // Contains Chunks related to Surface Primtive (Plane, Disc, ...)

trunk/Utilities/FROG/Includes/FROG/FROG_Element_Tools.cpp

@@ -139 +139 @@
                                 }                               
                         break;
+
+                       case C_PRIMITIVE_CONE :
+                                NObjs = (chunk_size-chunk_read)/(FROG_Element_Primitive_Cone::sizeOf()-6);
+                                for(int i=0;i<NObjs;i++){
+                                        mother->addDaughter(new FROG_Element_Primitive_Cone(pFile));
+                                        chunk_read += FROG_Element_Primitive_Cone::sizeOf()-6;
+                                }
+                        break;
+
 
                         case C_PRIMITIVE_CUSTOM_SURFACE :

trunk/Utilities/FROG/Includes/FROG/FROG_Element_Tools.h

@@ -25 +25 @@
 #include "FROG_Element_Primitive_PartialSphere.h"
 #include "FROG_Element_Primitive_Cylinder.h"
+#include "FROG_Element_Primitive_Cone.h"
 
 #include "FROG_Element_Primitive_CustomSurface.h"