Changeset 3296

Timestamp:

02/25/04 07:27:46 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/ONOFFAnalysis.C (modified) (6 diffs)
• manalysis/MSourcePosfromStarPos.cc (modified) (25 diffs)

trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C

@@ -182 +182 @@
       //const char *onfile  = "*.ON";
       const char *onfile  = "12*.ON";
+      //const char *onfile  = "12410.ON";
 
      const char *mcfile  = "/data/MAGIC/mc_eth/magLQE_3/gh/0/0/G_M0_00_0_550*.root";
@@ -370 +371 @@
     outNameImage += "Hillas";
     outNameImage += typeInput;
-    outNameImage += "1a.root";
+    outNameImage += "1b.root";
     gLog << "padded data to be written onto : " << outNameImage << endl;
 
@@ -714 +715 @@
     contbasic.SetName("SelBasic");
 
-    MFillH fillblind("BlindPixels[MHBlindPixels]", "MBlindPixels");
-    fillblind.SetName("HBlind");
+    //MFillH fillblind("BlindPixels[MHBlindPixels]", "MBlindPixels");
+    //fillblind.SetName("HBlind");
 
     MSigmabarCalc sigbarcalc;
@@ -803 +804 @@
 
     tliston.AddToList(&blind);
-    //tliston.AddToList(&contbasic);
-
-    tliston.AddToList(&fillblind);
+    tliston.AddToList(&contbasic);
+
+    //tliston.AddToList(&fillblind);
     tliston.AddToList(&sigbarcalc);
     tliston.AddToList(&fillsigtheta);
@@ -1829 +1830 @@
     filenameData += "Hillas";
     filenameData += typeInput;
-    filenameData += "1.root";
+    filenameData += "1b.root";
     gLog << "filenameData = " << filenameData << endl; 
 
@@ -1837 +1838 @@
     outNameImage += "Hillas";
     outNameImage += typeInput;
-    outNameImage += "2.root";
+    outNameImage += "2b.root";
     
 

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

@@ -79 +79 @@
     fRuns  = 0;
     fSize  = 100;
-    fStars = 1;
+    fStars = 0;
 
     fRunNr.Set(fSize);
@@ -88 +88 @@
     fdPhiTel.Set(fSize);
 
-    fDecStar.Set(fStars);
-    fRaStar.Set(fStars);
-    fxStar.ResizeTo(fStars,fSize);
-    fyStar.ResizeTo(fStars,fSize);
-    fdxStar.ResizeTo(fStars,fSize);
-    fdyStar.ResizeTo(fStars,fSize);
+    fDecStar.Set(1);
+    fRaStar.Set(1);
+    fxStar.ResizeTo(1,fSize);
+    fyStar.ResizeTo(1,fSize);
+    fdxStar.ResizeTo(1,fSize);
+    fdyStar.ResizeTo(1,fSize);
+
 }
 
@@ -137 +138 @@
                * 360.0 / (24.0 * kRad2Deg);
 
+  fStars += 1;
   fDecStar.Set(fStars);
   fDecStar[fStars-1] = (decStarDeg + decStarMin/60.0 + decStarSec/3600.0)
@@ -167 +169 @@
 
   // convert into radians
-  Int_t fStars = fDecStar.GetSize() + 1;
+  fStars = fDecStar.GetSize() + 1;
   fDecStar.Set(fStars);
   fDecStar[fStars-1] = (decStarDeg + decStarMin/60.0 + decStarSec/3600.0)
@@ -223 +225 @@
     //
 
+    *fLog << all << "---------------------------------" << endl;
     while(1)
     {
@@ -249 +252 @@
     *fLog << "all data were read" << endl;
     FixSize();
+
+    if (fDecSource == 0.0  ||  fRaSource == 0.0  ||  fStars == 0) 
+    {
+      *fLog << err << "MSourcePosfromStarPos::PreProcess; there are no sky coordinates defined for the source or from stars" 
+            << endl;
+    }
+    *fLog << all << "---------------------------------" << endl;
+
     //-------------------------------------------------------------
 
@@ -287 +298 @@
                     Double_t &dxSource,    Double_t &dySource)
 {
+  /*
   *fLog << "MSourcePosfromStarPos::SourcefromStar :  printout in degrees" << endl;
   *fLog << "       decStar, raStar = " << decStar[0]*kRad2Deg << ",  " 
@@ -306 +318 @@
   *fLog << "       xStar, yStar = " << xStar[0] << ",  " 
         << yStar[0] << endl;
-
+  */
 
   // the units are assumed to be radians for theta, phi, dec and ra
@@ -324 +336 @@
   Double_t sinal =    a1 * sin(phiTel) * denom;
 
-  *fLog << "thetaTel, phiTel, cosal, sinal = " << thetaTel << ",  "
-        << phiTel << ",  " << cosal << ",  " << sinal << endl;
+  //*fLog << "thetaTel, phiTel, cosal, sinal = " << thetaTel << ",  "
+  //      << phiTel << ",  " << cosal << ",  " << sinal << endl;
 
 
   // calculate coordinates of source in system B (see TDAS 00-11, eqs. (2))
-  Double_t xB0 =  cos(decSource) * cos(raSource);
-  Double_t yB0 =  cos(decSource) * sin(raSource);
+  // note that right ascension and hour angle go into opposite directions
+  Double_t xB0 =  cos(decSource) * cos(-raSource);
+  Double_t yB0 =  cos(decSource) * sin(-raSource);
   Double_t zB0 = -sin(decSource);
 
-  *fLog << "xB0, yB0, zB0 = " << xB0 << ",  " << yB0 << ",  "
-        << zB0 << endl;
+  //*fLog << "xB0, yB0, zB0 = " << xB0 << ",  " << yB0 << ",  "
+  //      << zB0 << endl;
 
   //-----------------------------------------------------
@@ -351 +364 @@
     sumwy += weighty;
 
-  *fLog << "weightx, weighty = " << weightx << ",  " << weighty << endl;
+    //*fLog << "weightx, weighty = " << weightx << ",  " << weighty << endl;
 
     // calculate coordinates of star in system B (see TDAS 00-11, eqs. (2))
-    Double_t xB  =  cos(decStar[i]) * cos(raStar[i]);
-    Double_t yB  =  cos(decStar[i]) * sin(raStar[i]);
+    // note that right ascension and hour angle go into opposite directions
+    Double_t xB  =  cos(decStar[i]) * cos(-raStar[i]);
+    Double_t yB  =  cos(decStar[i]) * sin(-raStar[i]);
     Double_t zB  = -sin(decStar[i]);
 
 
-  *fLog << "xB, yB, zB = " << xB << ",  " << yB << ",  "
-        << zB << endl;
+    //*fLog << "xB, yB, zB = " << xB << ",  " << yB << ",  "
+    //    << zB << endl;
 
  
@@ -375 +389 @@
     Double_t z = -(xB*xB0 + yB*yB0 + zB*zB0);
 
-  *fLog << "x, y, z = " << x << ",  " << y << ",  "
-        << z << endl;
+    //*fLog << "x, y, z = " << x << ",  " << y << ",  "
+    //    << z << endl;
 
 
@@ -383 +397 @@
     Double_t ytilde = -f/z * (sinal*x + cosal*y);
 
-  *fLog << "xtilde, ytile = " << xtilde << ",  " << ytilde << endl;
+    //*fLog << "xtilde, ytile = " << xtilde << ",  " << ytilde << endl;
 
 
@@ -399 +413 @@
   dySource = 1.0 / sqrt(sumwy);
     
-  *fLog << all << "MSourcePosfromStarPos::SourcefromStar; xSource, ySource = "
+  /*
+  Int_t run = fRun->GetRunNumber();
+  *fLog << all << "MSourcePosfromStarPos::SourcefromStar; run, xSource, ySource = "
+        << run << " : "
         << xSource << " +- " << dxSource << ",   " 
         << ySource << " +- " << dySource << endl; 
+   */
 }
 
@@ -411 +429 @@
 Bool_t MSourcePosfromStarPos::ReInit(MParList *pList)
 {
-  //if (fDecSource == 0.0  ||  fRaSource == 0.0  ||  fStars == 0) 
-  //{
-  //  *fLog << err << "MSourcePosfromStarPos::ReInit; sky coordinates of star and source are not defined ... aborting" 
-  //        << endl;
-    //return kFALSE;
-  //}
 
   Int_t run = fRun->GetRunNumber();
-
-  *fLog << "MSourcePosfromStarPos::ReInit; run = " << run << endl;
+  *fLog << all << "MSourcePosfromStarPos::ReInit; run = " << run << endl;
 
   //-------------------------------------------------------------------
@@ -437 +448 @@
       fMcEvt->SetReadyToSave();
 
-      *fLog << "theta, phi = " << thetarad*kRad2Deg << ",  "
+      *fLog << all << "theta, phi = " << thetarad*kRad2Deg << ",  "
             << phirad*kRad2Deg << endl;
        
@@ -443 +454 @@
       // Get source position and put it into MSrcPosCam
 
-      /*
+      
       if (fStars > 0)
       {
@@ -469 +480 @@
 
         *fLog << all << "MSourcePosfromStarPos::ReInit; fRunNr, fxSource, fySource = "
-              << fRunNr[i] << ",  " << fxSource << ",  " << fySource 
-              << endl;
+              << fRunNr[i] << ",  " << fxSource << " +- " << fdxSource 
+              << ",  " << fySource  << " +- "  << fdySource << endl;
        
         fSrcPos->SetReadyToSave();       
       }
-      */
+      
 
       return kTRUE;
@@ -483 +494 @@
           << run << endl;
 
-    Double_t thetadeg = 90.0;
+    Double_t thetadeg = 25.0;
     Double_t thetarad = thetadeg / kRad2Deg;
     fMcEvt->SetTelescopeTheta(thetarad);
@@ -500 +511 @@
 Int_t MSourcePosfromStarPos::Process()
 {
-  Int_t run = fRun->GetRunNumber();
-
+  //Int_t run = fRun->GetRunNumber();
   //*fLog << "MSourcePosfromStarPos::Process; run = " << run << endl;
     
@@ -524 +534 @@
 {
   *fLog << "MSourcePosfromStarPos::FixSize; fix size of arrays : fRuns = "
-        << fRuns << endl;
+        << fRuns << ",  fStars = " << fStars << endl;
 
     fSize = fRuns;
@@ -535 +545 @@
     fdPhiTel.Set(fSize);
 
-    fStars = fxStar.GetNrows();
-    fxStar.ResizeTo(fStars, fSize);
-    fyStar.ResizeTo(fStars, fSize);
-    fdxStar.ResizeTo(fStars, fSize);
-    fdyStar.ResizeTo(fStars, fSize);
+    Int_t fRows = fxStar.GetNrows();
+    fxStar.ResizeTo(fRows, fSize);
+    fyStar.ResizeTo(fRows, fSize);
+    fdxStar.ResizeTo(fRows, fSize);
+    fdyStar.ResizeTo(fRows, fSize);
 }
 
@@ -593 +603 @@
   *fIn >> ival;
   
-  *fLog << fRuns <<"th run : " << ival << endl;  
+  //*fLog << fRuns <<"th run : " << ival << endl;  
 
   fRunNr.AddAt(ival, fRuns-1);
 
-  *fLog << "check : fRuns, fRunNr[fRuns-1], fRunNr[fRuns] = " << fRuns << ",  "
-        << fRunNr[fRuns-1] << ",  " << fRunNr[fRuns] << endl;
+  //*fLog << "check : fRuns, fRunNr[fRuns-1], fRunNr[fRuns] = " << fRuns << ",  "
+  //      << fRunNr[fRuns-1] << ",  " << fRunNr[fRuns] << endl;
 
   // read mjdS, hmsS, mjdE, hmsE
@@ -614 +624 @@
   *fIn >> val;
   fThetaTel.AddAt(val/kRad2Deg, fRuns-1);
-  *fLog << "val, fThetaTel[fRuns-1] = " << val << ",  "
-        << fThetaTel[fRuns-1] << endl;
+  //*fLog << "val, fThetaTel[fRuns-1] = " << val << ",  "
+  //    << fThetaTel[fRuns-1] << endl;
 
 
   *fIn >> val;
   fPhiTel.AddAt(val/kRad2Deg, fRuns-1);
-  *fLog << "val, fPhiTel[fRuns-1] = " << val << ",  "
-        << fPhiTel[fRuns-1] << endl;
+  //*fLog << "val, fPhiTel[fRuns-1] = " << val << ",  "
+  //      << fPhiTel[fRuns-1] << endl;
 
 
@@ -635 +645 @@
     *fIn >> val;
     fxStar(i, fRuns-1) = val / fMm2Deg;;
-    *fLog << "val, fxStar(i, fRuns-1) = " << val << ",  "
-          << fxStar(i, fRuns-1) << endl;
+    //*fLog << "val, fxStar(i, fRuns-1) = " << val << ",  "
+    //      << fxStar(i, fRuns-1) << endl;
 
     *fIn >> val;
     fyStar(i, fRuns-1) = val / fMm2Deg;
-    *fLog << "val, fyStar(i, fRuns-1) = " << val << ",  "
-          << fyStar(i, fRuns-1) << endl;
+    //*fLog << "val, fyStar(i, fRuns-1) = " << val << ",  "
+    //      << fyStar(i, fRuns-1) << endl;
 
 
@@ -701 +711 @@
 
     const Bool_t noexist = !(*fIn);
+
 
     if (noexist)