Changeset 10116 for fact/pixelmap/Pixel.cc

Timestamp:

01/24/11 12:04:23 (14 years ago)

Author:

weitzel

Message:

new version of pixelmap class

File:

• fact/pixelmap/Pixel.cc (modified) (2 diffs)

fact/pixelmap/Pixel.cc

@@ -1 @@
-#include "PixelMap.h"
+#include "Pixel.h"
 #include <iostream>
 
-Pixel::Pixel() : _DRSboard(999999999), _DRSchip(999999999), _DRSchannel(999999999),
-                 _HVboard(999999999), _HVchain(999999999), _HVchannel(999999999) { }
+Pixel::Pixel() : _FPAcrate(0), _FPAboard(0), _FPApatch(0), _FPApixel(0),
+                 _HVcrate(0), _HVboard(0), _HVchannel(0),
+                 _POSx(0), _POSy(0) {
 
-Pixel::Pixel(unsigned int DRSboard, unsigned int DRSchip, unsigned int DRSchannel,
-             unsigned int HVboard, unsigned int HVchain, unsigned int HVchannel)
-    : _DRSboard(DRSboard), _DRSchip(DRSchip), _DRSchannel(DRSchannel),
-      _HVboard(HVboard), _HVchain(HVchain), _HVchannel(HVchannel) {
+}
 
-    //???check here whether values make sense and eventually give error messages???
+Pixel::Pixel(unsigned int FPAcrate, unsigned int FPAboard, unsigned int FPApatch, unsigned int FPApixel,
+             unsigned int HVcrate, unsigned int HVboard, unsigned int HVchannel,
+             int POSx, int POSy)
+    : _FPAcrate(FPAcrate), _FPAboard(FPAboard), _FPApatch(FPApatch), _FPApixel(FPApixel),
+      _HVcrate(HVcrate), _HVboard(HVboard), _HVchannel(HVchannel),
+      _POSx(POSx), _POSy(POSy) {
 
 }
@@ -16 +19 @@
 std::ostream& operator << (std::ostream& s, const Pixel& pixel) {
   
-    return s << "DRSboard="<<pixel._DRSboard<<"\n"
-             << "DRSchip="<<pixel._DRSchip<<"\n"
-             << "DRSchannel="<<pixel._DRSchannel<<"\n"
+    return s << "FPAcrate="<<pixel._FPAcrate<<"\n"
+             << "FPAboard="<<pixel._FPAboard<<"\n"
+             << "FPApatch="<<pixel._FPApatch<<"\n"
+             << "FPApixel="<<pixel._FPApixel<<"\n"
+             << "HVcrate="<<pixel._HVcrate<<"\n"
              << "HVboard="<<pixel._HVboard<<"\n"
-             << "HVchain="<<pixel._HVchain<<"\n"
-             << "HVchannel="<<pixel._HVchannel<<"\n";
+             << "HVchannel="<<pixel._HVchannel<<"\n"
+             << "POSx="<<pixel._POSx<<"\n"
+             << "POSy="<<pixel._POSy<<"\n";
 
 }