Changeset 2703

Timestamp:

12/18/03 10:41:57 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• include-Classes/MMcFormat/MMcConfigRunHeader.cc (modified) (3 diffs)
• include-Classes/MMcFormat/MMcConfigRunHeader.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/12/18: Abelardo Moralejo
+
+   * mmc/MMcConfigRunHeader.[h,cc]
+     - Removed some obsolete parameters no longer used in reflector 
+       simulation since version 0.6.
+     - Added getter and setter functions for fPointSpread (allows 
+       camera simulation to change the value whenever the spot is made
+       bigger to fit the data).
+
  2003/12/17: Abelardo Moralejo
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.cc

@@ -62 +62 @@
     fRadiusMirror=-1;
     fFocalDist   =-1;
-    fFocalStdev  =-1;
     fPointSpread =-1;
-    fPointStdev  =-1;
-    fDevAdjust   =-1;
     fBlackSpot   =-1;
     fCameraWidth =-1;
@@ -80 +77 @@
 void MMcConfigRunHeader::SetMagicDef(Float_t radius,
                                      Float_t focal,
-                                     Float_t stdfocal,
                                      Float_t point,
-                                     Float_t stdpoint,
-                                     Float_t adjust,
                                      Float_t spot,
                                      Float_t camwidth)
@@ -89 +83 @@
     fRadiusMirror=radius;
     fFocalDist=focal;
-    fFocalStdev=stdfocal;
     fPointSpread=point;
-    fPointStdev=stdpoint;
-    fDevAdjust=adjust;
     fBlackSpot=spot;
     fCameraWidth=camwidth;

trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.h

@@ -26 +26 @@
     // Magic Def Parameters
     Float_t fFocalDist;         // [cm] Focal distance
-    Float_t fFocalStdev;       // [cm] Standard deviation of focal distance
-    Float_t fPointSpread;       // [cm] Point spread function
-    Float_t fPointStdev;        // [cm] Standard deviation of point spread function
-    Float_t fDevAdjust;         // [cm] Standard deviation of the adjustment value
+    Float_t fPointSpread;       // [cm] Point spread function, sigma in x and y on the camera
     Float_t fBlackSpot;         // [cm] Radius of black spot in the mirror center
     Float_t fCameraWidth;       // [cm] Radius on the camera plain 
@@ -46 +43 @@
     ~MMcConfigRunHeader() { delete fMirrors; delete fPMTs; }
 
-    void SetMagicDef(Float_t radius, Float_t focal, Float_t stdfocal, Float_t point,
-                     Float_t stdpoint, Float_t adjust, Float_t spot, Float_t camwidth);
+    void SetMagicDef(Float_t radius, Float_t focal, Float_t point,
+                     Float_t spot, Float_t camwidth);
     void SetLightGuides(const TArrayF &theta, const TArrayF &factor);
 
@@ -55 +52 @@
     UInt_t GetNumPMTs() const { return fNumPMTs; }
     void   InitSizePMTs(UInt_t num) { fPMTs->Expand(num); }
+
+    Float_t GetPointSpread() const { return fPointSpread; }
+    void    SetPointSpread(Float_t x) { fPointSpread = x; }
 
     void   AddMirror(Int_t id)
@@ -72 +72 @@
     MGeomPMT &GetPMT(int i) const { return *(MGeomPMT*)(fPMTs->UncheckedAt(i)); }
 
-    ClassDef(MMcConfigRunHeader, 1)  // class for monte carlo configuration information
+    ClassDef(MMcConfigRunHeader, 2)  // class for monte carlo configuration information
 };