Changeset 1600 for trunk/MagicSoft/include-Classes/MMcFormat

Timestamp:

11/13/02 17:03:19 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/include-Classes/MMcFormat

Files:

• MMcConfigRunHeader.cc (modified) (4 diffs)
• MMcConfigRunHeader.h (modified) (4 diffs)
• McLinkDef.h (modified) (1 diff)

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

@@ -35 +35 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-
-#ifndef MARS_MMcConfigRunHeader
 #include "MMcConfigRunHeader.h"
-#endif
 
 #include <fstream.h>
 #include <iomanip.h>
 
+#include <TArrayF.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
+
 ClassImp(MMcConfigRunHeader);
 
@@ -53 +53 @@
 //
 MMcConfigRunHeader::MMcConfigRunHeader(const char *name, const char *title)
+    : fNumMirrors(0), fNumPMTs(0), fIncidentTheta(181), fLightGuidesFactor(181)
 {
     fName  = name  ? name  : "MMcConfigRunHeader";
     fTitle = title ? title : "Mc Configuration Information";
 
-    fNumMirrors=0;
-    fNumPMTs=0;
-
-    fRadiusMirror=-10.0;
-    fFocalDist=-10.0;
-    fFocalStdev=-10.0;
-    fPointSpread=-10.0;
-    fPointStdev=-10.0;
-    fDevAdjust=-10.0;
-    fBlackSpot=-10.0;
-    fCameraWidth=-10.0;
-
-    fIncidentTheta->Set(181);
-    fLightGuidesFactor->Set(181);
+    fRadiusMirror=-1;
+    fFocalDist   =-1;
+    fFocalStdev  =-1;
+    fPointSpread =-1;
+    fPointStdev  =-1;
+    fDevAdjust   =-1;
+    fBlackSpot   =-1;
+    fCameraWidth =-1;
 
     fMirrors = new TClonesArray("MGeomMirror", 0);
@@ -77 +72 @@
 }
 
-// -------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 //
-// SetMagicDef
+// DESCRIPTION MISSING
 //
 void MMcConfigRunHeader::SetMagicDef(const Float_t  radius,
@@ -101 +96 @@
 }
 
-void  MMcConfigRunHeader::SetLightGuides(TArrayF *theta, TArrayF *factor){
-  
-  if(fIncidentTheta->GetSize()==theta->GetSize() &&
-     fLightGuidesFactor->GetSize()==factor->GetSize()){
-    theta->Copy(*fIncidentTheta);
-    factor->Copy(*fLightGuidesFactor);
-  }
-  else
-    *fLog<<err << "MMcConfigRunHeader::SetLightGuides: fIncidentTheta "
-        <<"and fLightGuidesFactor do not have "
-        <<"size of setting arrays"<<endl;
+// --------------------------------------------------------------------------
+//
+// DESCRIPTION MISSING
+//
+void  MMcConfigRunHeader::SetLightGuides(const TArrayF &theta, const TArrayF &factor)
+{
+    if (fIncidentTheta.GetSize()    !=theta.GetSize() ||
+        fLightGuidesFactor.GetSize()!=factor.GetSize())
+    {
+        *fLog<< err << dbginf << "fIncidentTheta or fLightGuidesFactor ";
+        *fLog << "do not have size of setting arrays" << endl;
+        return;
+    }
 
+    fIncidentTheta = theta;
+    fLightGuidesFactor = factor;
 }
-
-
-

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

@@ -5 +5 @@
 #include <TClonesArray.h>
 #endif
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
-#endif
+
 #ifndef MARS_MGeomMirror
 #include "MGeomMirror.h"
 #endif
-
 #ifndef MARS_MGeomPMT
 #include "MGeomPMT.h"
@@ -23 +20 @@
 private:
     // Mirror Information
-    UShort_t        fNumMirrors;
+    UShort_t      fNumMirrors;
     Float_t       fRadiusMirror;// [cm] Radius of a single mirror
     TClonesArray *fMirrors;     // FIXME: Change TClonesArray away from a pointer?
@@ -42 +39 @@
 
     // Light Guides Information
-    TArrayF *fIncidentTheta;    // [deg]
-    TArrayF *fLightGuidesFactor;// []
+    TArrayF fIncidentTheta;    // [deg]
+    TArrayF fLightGuidesFactor;// []
 
 public:
@@ -51 +48 @@
     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 SetLightGuides(TArrayF *theta, TArrayF *factor);
+    void SetLightGuides(const TArrayF &theta, const TArrayF &factor);
 
     UInt_t GetNumMirror() const { return fNumMirrors; }

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

@@ -10 +10 @@
 #pragma link C++ class MMcTrigHeader+;
 #pragma link C++ class MMcFadcHeader+;
+#pragma link C++ class MMcConfigRunHeader+;
 
 #endif