Changeset 5099 for trunk/MagicSoft/Simulation/Detector/include-MTrigger

Timestamp:

09/17/04 14:51:02 (20 years ago)

Author:

moralejo

Message:

Adapted headers to current c++ style, removed -Wno-deprecated from
compilation options.

Location:

trunk/MagicSoft/Simulation/Detector/include-MTrigger

Files:

• MGTriggerSignal.hxx (modified) (1 diff)
• MTrigger.cxx (modified) (2 diffs)
• MTrigger.hxx (modified) (1 diff)

trunk/MagicSoft/Simulation/Detector/include-MTrigger/MGTriggerSignal.hxx

@@ -4 +4 @@
 
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 
 #include <TROOT.h>

trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx

@@ -13 +13 @@
 #include "MGeomCam.h"
 #include "MGeomPix.h"
+
+using namespace std;
 
 MTrigger::MTrigger(int pix) { 
@@ -1266 +1268 @@
     ii=(Int_t)i/8;
     if (dknt[i]==kTRUE){
-      map[ii]=map[ii]+(Int_t)pow(2,i-ii*8);
+      map[ii]=map[ii]+(Int_t)pow((double)2, (double)i-ii*8);
     }
   }

trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx

@@ -15 +15 @@
 //
 //
-#include <iostream.h>
+#include <iostream>
 #include <math.h>