Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4684)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4685)
@@ -19,4 +19,11 @@
 
                                                  -*-*- 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
+
 
 
Index: trunk/MagicSoft/Mars/mtemp/MFindStars.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MFindStars.cc	(revision 4684)
+++ trunk/MagicSoft/Mars/mtemp/MFindStars.cc	(revision 4685)
@@ -57,6 +57,6 @@
 #include "MTime.h"
 #include "MReportDrive.h"
-#include "MStarLocalCam.h"
-#include "MStarLocalPos.h"
+#include "MStarCam.h"
+#include "MStarPos.h"
 
 #include "MParList.h"
@@ -107,6 +107,6 @@
   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,8 +373,8 @@
     
 
-    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,7 +442,7 @@
       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,5 +484,5 @@
 	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,6 +515,6 @@
 
     TIter Next(fStars->GetList());
-    MStarLocalPos* star;
-    while ((star=(MStarLocalPos*)Next())) {
+    MStarPos* star;
+    while ((star=(MStarPos*)Next())) {
        FindStar(star);
        ShadowStar(star);
@@ -772,5 +772,5 @@
 //
 
-Bool_t MFindStars::FindStar(MStarLocalPos* star)
+Bool_t MFindStars::FindStar(MStarPos* star)
 {    
   UInt_t numPixels = fGeomCam->GetNumPixels();
@@ -1235,5 +1235,5 @@
 }
 
-Bool_t MFindStars::ShadowStar(MStarLocalPos* star)
+Bool_t MFindStars::ShadowStar(MStarPos* star)
 {
     UInt_t numPixels = fGeomCam->GetNumPixels();
Index: trunk/MagicSoft/Mars/mtemp/MFindStars.h
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MFindStars.h	(revision 4684)
+++ trunk/MagicSoft/Mars/mtemp/MFindStars.h	(revision 4685)
@@ -27,6 +27,6 @@
 class MTime;
 class MReportDrive;
-class MStarLocalCam;
-class MStarLocalPos;
+class MStarCam;
+class MStarPos;
 
 class MFindStars : public MTask
@@ -39,5 +39,5 @@
     MTime         *fTimeCurr;
     MReportDrive  *fDrive;
-    MStarLocalCam *fStars;
+    MStarCam *fStars;
 
     MAstroCamera fAstro;
@@ -74,6 +74,6 @@
     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;
Index: trunk/MagicSoft/Mars/mtemp/MSourceDirections.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MSourceDirections.cc	(revision 4684)
+++ trunk/MagicSoft/Mars/mtemp/MSourceDirections.cc	(revision 4685)
@@ -53,6 +53,6 @@
 #include "MTime.h"
 #include "MReportDrive.h"
-#include "MStarLocalCam.h"
-#include "MStarLocalPos.h"
+#include "MStarCam.h"
+#include "MStarPos.h"
 
 #include "MParList.h"
@@ -90,7 +90,7 @@
   } 
 
-  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,7 +128,7 @@
   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);
Index: trunk/MagicSoft/Mars/mtemp/MSourceDirections.h
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MSourceDirections.h	(revision 4684)
+++ trunk/MagicSoft/Mars/mtemp/MSourceDirections.h	(revision 4685)
@@ -12,6 +12,6 @@
 class MTime;
 class MReportDrive;
-class MStarLocalCam;
-class MStarLocalPos;
+class MStarCam;
+class MStarPos;
 
 class MSourceDirections : public MTask
@@ -23,5 +23,5 @@
     MTime         *fTimeCurr;
     MReportDrive  *fDrive;
-    MStarLocalCam *fStars;
+    MStarCam *fStars;
 
     MAstroCamera fAstro;