Changeset 3598 for trunk/MagicSoft/Mars/manalysis

Timestamp:

03/26/04 05:53:16 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MSourcePosfromStarPos.cc (modified) (14 diffs)
• MSourcePosfromStarPos.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

@@ -88 +88 @@
     fdPhiTel.Set(fSize);
 
-    fDecStar.Set(1);
-    fRaStar.Set(1);
-    fxStar.ResizeTo(1,fSize);
-    fyStar.ResizeTo(1,fSize);
-    fdxStar.ResizeTo(1,fSize);
-    fdyStar.ResizeTo(1,fSize);
+    Int_t fRows = 1;
+    fDecStar.Set(fRows);
+    fRaStar.Set(fRows);
+    fxStar.ResizeTo(fRows,fSize);
+    fyStar.ResizeTo(fRows,fSize);
+    fdxStar.ResizeTo(fRows,fSize);
+    fdyStar.ResizeTo(fRows,fSize);
 
     fStars = 0;
@@ -194 +195 @@
 
   // convert into radians
-  fStars = fDecStar.GetSize() + 1;
+  fStars += 1;
   fDecStar.Set(fStars);
   fRaStar.Set(fStars);
@@ -274 +275 @@
 
       *fLog << "read data" << endl;
+
+      // read "fStarsRead" = no.of (x,y) pairs to be read
+      *fIn >> fStarsRead;
+
       while (1)
       {
@@ -294 +299 @@
     if (fDecSource == 0.0  ||  fRaSource == 0.0  ||  fStars == 0) 
     {
-      *fLog << warn << "MSourcePosfromStarPos::PreProcess; there are no sky coordinates defined for the source or from stars; fStars = " << fStars 
+      *fLog << warn << "MSourcePosfromStarPos::PreProcess; there are no sky coordinates defined for the source or from stars; fStars, fStarsRead = " 
+            << fStars << ",  " << fStarsRead 
             << endl;
     }
@@ -482 +488 @@
 Bool_t MSourcePosfromStarPos::ReInit(MParList *pList)
 {
+  //if (1 == 1) return kTRUE;
+
 
   Int_t run = fRun->GetRunNumber();
@@ -519 +527 @@
 
       
-      if (fStars > 0)
+      if (fStars > 0  && fStars == fStarsRead)
       {
         TArrayD xStar(fxStar.GetNrows());
@@ -624 +632 @@
 void MSourcePosfromStarPos::FixSize()
 {
-  *fLog << "MSourcePosfromStarPos::FixSize; fix size of arrays : fRuns = "
-        << fRuns << ",  fStars = " << fStars << endl;
-  *fLog << "       first run : " << fRunNr[0] << ",  last run : "
-        << fRunNr[fRuns-1] << endl;
-
     fSize = fRuns;
+    if (fRuns <= 0)
+      fSize = 1;
 
     fRunNr.Set(fSize);
@@ -639 +644 @@
 
     Int_t fRows = fxStar.GetNrows();
-    if (fRows <= 0)
-      fRows = 1;
     fxStar.ResizeTo(fRows, fSize);
     fyStar.ResizeTo(fRows, fSize);
     fdxStar.ResizeTo(fRows, fSize);
     fdyStar.ResizeTo(fRows, fSize);
+
+  *fLog << "MSourcePosfromStarPos::FixSize; fix size of arrays : fStars = "
+        << fStars << ",  fRuns = " << fRuns << ",  fRows = " << fRows
+        << ",  fSize = " << fSize << endl;
+  *fLog << "       first run : " << fRunNr[0] << ",  last run : "
+        << fRunNr[fRuns-1] << endl;
 }
 
@@ -657 +666 @@
 
   // extend size of arrays if necessary
-  if ( fRuns >= (fSize-1) )
+  if ( fRuns >= fSize )
   {
     fSize += 100;
@@ -669 +678 @@
     
     Int_t fRows = fxStar.GetNrows();
-    if (fRows <= 0)
-      fRows = 1;
     fxStar.ResizeTo(fRows, fSize);
     fyStar.ResizeTo(fRows, fSize);
     fdxStar.ResizeTo(fRows, fSize);
     fdyStar.ResizeTo(fRows, fSize);
+
+    *fLog << "MSourcePosfromStarPos::ReadData(); size of arrays has been increased to (fRows, fSize) = ("
+          << fRows << ",  " << fSize << ")" << endl;
   }
 
@@ -694 +704 @@
   //*fIn >> val;
   //-------------------
+
 
 
@@ -700 +711 @@
     *fIn >> ival;
 
+    if (fIn->eof())
+      return;
+
     // run number must be greater than 10000
-    if (fabs((Double_t)ival) < 10000)
+    if (fabs(ival) < 10000)
     {
       *fLog << err << "===========> Error when reading file with theta and phi <========="
@@ -711 +725 @@
 
   fRuns += 1;
-  //*fLog << fRuns <<"th run : " << ival << endl;  
+  *fLog << fRuns <<"th run : " << ival << endl;  
 
   fRunNr.AddAt(ival, fRuns-1);
@@ -755 +769 @@
   // input is in [deg], convert to [mm]
 
-  //*fLog << "ReadData : fStars = " << fStars << endl;
-  for (Int_t i=0; i<fStars; i++)
-  {
-    *fIn >> val;
-    //fxStar(i, fRuns-1) = val / fMm2Deg;
-    fxStar(i, fRuns-1) = val;
-    //*fLog << "val, fxStar(i, fRuns-1) = " << val << ",  "
-    //      << fxStar(i, fRuns-1) << endl;
-
-    *fIn >> val;
-    //fyStar(i, fRuns-1) = val / fMm2Deg;
-    fyStar(i, fRuns-1) = val;
-    //*fLog << "val, fyStar(i, fRuns-1) = " << val << ",  "
-    //      << fyStar(i, fRuns-1) << endl;
-
-
-    //*fIn >> val;
-    //*fLog << "y=dxStar = " << val << endl;
-
-    //fdxStar(i, fRuns-1) = val / fMm2Deg;
-    //fdxStar(i, fRuns-1) = val;
-    fdxStar(i, fRuns-1) = 1.0;
-    //*fIn >> val;
-    //*fLog << "y=dyStar = " << val << endl;
-
-    //fdyStar(i, fRuns-1) = val / fMm2Deg;
-    //fdyStar(i, fRuns-1) = val;
-    fdyStar(i, fRuns-1) = 1.0;
-  }
-
+  //*fLog << "ReadData : fStarsRead = " << fStarsRead << endl;
+
+    for (Int_t i=0; i<fStarsRead; i++)
+    {
+      *fIn >> val;
+      if (i<fStars) fxStar(i, fRuns-1) = val;
+
+      *fIn >> val;
+      if (i<fStars) fyStar(i, fRuns-1) = val;
+
+      //*fIn >> val;
+      // if (i < fStars) fdxStar(i, fRuns-1) = val;
+      if (i < fStars) fdxStar(i, fRuns-1) = 1.0;
+
+      //*fIn >> val;
+      // if (i < fStars) fdyStar(i, fRuns-1) = val;
+      if (i < fStars) fdyStar(i, fRuns-1) = 1.0;
+    }
 }
 

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.h

@@ -53 +53 @@
     Int_t   fSize;                // final   number of runs
     Int_t   fStars;               // number of stars
+    Int_t   fStarsRead;           // number of (x,y) pairs to be read