Changeset 4685 for trunk/MagicSoft/Mars

Timestamp:

08/19/04 10:27:35 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mtemp/MFindStars.cc (modified) (8 diffs)
• mtemp/MFindStars.h (modified) (3 diffs)
• mtemp/MSourceDirections.cc (modified) (3 diffs)
• mtemp/MSourceDirections.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/08/19: Robert Wagner
+   * mtemp/MFindStars.[cc,h], mastro/MAstroCamera.cc,
+     mtemp/MSourceDirections.[cc,h]
+     - Changes to reflect the change of name of
+       MStarPos, MStarCam
+
 
 

trunk/MagicSoft/Mars/mtemp/MFindStars.cc

@@ -57 +57 @@
 #include "MTime.h"
 #include "MReportDrive.h"
-#include "MStarLocalCam.h"
-#include "MStarLocalPos.h"
+#include "MStarCam.h"
+#include "MStarPos.h"
 
 #include "MParList.h"
@@ -107 +107 @@
   MTaskList*     tlist = (MTaskList*)plist->FindObject("MTaskList");
   MFindStars*    find  = (MFindStars*)tlist->FindObject("MFindStars");
-  MStarLocalCam* stars = 
-          (MStarLocalCam*)plist->FindObject("MStarLocalCam","MStarLocalCam");
+  MStarCam* stars = 
+          (MStarCam*)plist->FindObject("MStarCam","MStarCam");
   MGeomCam*      geom  = (MGeomCam*)plist->FindObject("MGeomCam");
 
@@ -373 +373 @@
     
 
-    fStars = (MStarLocalCam*)pList->FindCreateObj(AddSerialNumber("MStarLocalCam"),"MStarLocalCam");
+    fStars = (MStarCam*)pList->FindCreateObj(AddSerialNumber("MStarCam"),"MStarCam");
     if (!fStars)
     {
-      *fLog << err << AddSerialNumber("MStarLocalCam") << " cannot be created ... aborting" << endl;
+      *fLog << err << AddSerialNumber("MStarCam") << " cannot be created ... aborting" << endl;
       return kFALSE;
     }
@@ -442 +442 @@
       cout << "Number of Stars added by astrocamera is " <<fStars->GetList()->GetSize() << endl;
       
-      MStarLocalPos* starpos;
+      MStarPos* starpos;
       TIter Next(fStars->GetList());
-      while ((starpos=(MStarLocalPos*)Next())) {
+      while ((starpos=(MStarPos*)Next())) {
         starpos->SetCalcValues(40,40,starpos->GetXExp(),starpos->GetYExp(),fRingInterest/2,fRingInterest/2);
         starpos->SetFitValues (40,40,starpos->GetXExp(),starpos->GetYExp(),fRingInterest/2,fRingInterest/2,0.,-1);
@@ -484 +484 @@
         while(FindPixelWithMaxDC(maxPixelDC, maxPixel)) {
           
-          MStarLocalPos *starpos = new MStarLocalPos;
+          MStarPos *starpos = new MStarPos;
           starpos->SetExpValues(maxPixelDC,maxPixel.GetX(),maxPixel.GetY());
           starpos->SetCalcValues(maxPixelDC,maxPixelDC,maxPixel.GetX(),maxPixel.GetY(),fRingInterest/2,fRingInterest/2);
@@ -515 +515 @@
 
     TIter Next(fStars->GetList());
-    MStarLocalPos* star;
-    while ((star=(MStarLocalPos*)Next())) {
+    MStarPos* star;
+    while ((star=(MStarPos*)Next())) {
        FindStar(star);
        ShadowStar(star);
@@ -772 +772 @@
 //
 
-Bool_t MFindStars::FindStar(MStarLocalPos* star)
+Bool_t MFindStars::FindStar(MStarPos* star)
 {    
   UInt_t numPixels = fGeomCam->GetNumPixels();
@@ -1235 +1235 @@
 }
 
-Bool_t MFindStars::ShadowStar(MStarLocalPos* star)
+Bool_t MFindStars::ShadowStar(MStarPos* star)
 {
     UInt_t numPixels = fGeomCam->GetNumPixels();

trunk/MagicSoft/Mars/mtemp/MFindStars.h

@@ -27 +27 @@
 class MTime;
 class MReportDrive;
-class MStarLocalCam;
-class MStarLocalPos;
+class MStarCam;
+class MStarPos;
 
 class MFindStars : public MTask
@@ -39 +39 @@
     MTime         *fTimeCurr;
     MReportDrive  *fDrive;
-    MStarLocalCam *fStars;
+    MStarCam *fStars;
 
     MAstroCamera fAstro;
@@ -74 +74 @@
     Bool_t DCPedestalCalc();
     Bool_t FindPixelWithMaxDC(Float_t &maxDC, MGeomPix &maxPix);
-    Bool_t FindStar(MStarLocalPos* star);
-    Bool_t ShadowStar(MStarLocalPos* star);
+    Bool_t FindStar(MStarPos* star);
+    Bool_t ShadowStar(MStarPos* star);
 
     TString fGeometryFile;

trunk/MagicSoft/Mars/mtemp/MSourceDirections.cc

@@ -53 +53 @@
 #include "MTime.h"
 #include "MReportDrive.h"
-#include "MStarLocalCam.h"
-#include "MStarLocalPos.h"
+#include "MStarCam.h"
+#include "MStarPos.h"
 
 #include "MParList.h"
@@ -90 +90 @@
   } 
 
-  fStars = (MStarLocalCam*)pList->FindCreateObj(AddSerialNumber("MStarLocalCam"),"MSourceLocalCam");
+  fStars = (MStarCam*)pList->FindCreateObj(AddSerialNumber("MStarCam"),"MSourceCam");
   if (!fStars) {
-    *fLog << err << AddSerialNumber("MStarLocalCam") << " cannot be created ... aborting" << endl;
+    *fLog << err << AddSerialNumber("MStarCam") << " cannot be created ... aborting" << endl;
     return kFALSE;
   }
@@ -128 +128 @@
   fAstro.FillStarList(fStars->GetList());      
       
-  MStarLocalPos* starpos;
+  MStarPos* starpos;
   TIter Next(fStars->GetList());
-  while ((starpos=(MStarLocalPos*)Next())) {
+  while ((starpos=(MStarPos*)Next())) {
     starpos->SetCalcValues(40,40,starpos->GetXExp(),starpos->GetYExp(),0.,0.);
     starpos->SetFitValues (40,40,starpos->GetXExp(),starpos->GetYExp(),0.,0.,0.,1);

trunk/MagicSoft/Mars/mtemp/MSourceDirections.h

@@ -12 +12 @@
 class MTime;
 class MReportDrive;
-class MStarLocalCam;
-class MStarLocalPos;
+class MStarCam;
+class MStarPos;
 
 class MSourceDirections : public MTask
@@ -23 +23 @@
     MTime         *fTimeCurr;
     MReportDrive  *fDrive;
-    MStarLocalCam *fStars;
+    MStarCam *fStars;
 
     MAstroCamera fAstro;