Changeset 3300 for trunk/MagicSoft/Mars

Timestamp:

02/25/04 14:13:12 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/ONOFFAnalysis.C (modified) (3 diffs)
• manalysis/MSourcePosfromStarPos.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C

@@ -371 +371 @@
     outNameImage += "Hillas";
     outNameImage += typeInput;
-    outNameImage += "1b.root";
+    outNameImage += "1e.root";
     gLog << "padded data to be written onto : " << outNameImage << endl;
 
@@ -766 +766 @@
       MWriteRootFile write(outNameImage);
 
-      write.AddContainer("MRawRunHeader", "RunHeaders");
+      //write.AddContainer("MRawRunHeader", "RunHeaders");
       //write.AddContainer("MMcRunHeader",  "RunHeaders", kFALSE);
       //write.AddContainer("MTime",         "Events");
@@ -1820 +1820 @@
     // file to be updated (either ON or MC)
 
-    TString typeInput = "ON";
-    //TString typeInput = "OFF";
+    //TString typeInput = "ON";
+    TString typeInput = "OFF";
     //TString typeInput = "MC";
     gLog << "typeInput = " << typeInput << endl;
 
+    if (typeInput == "ON")
+      TString file(onfile);
+    else if (typeInput == "OFF")
+      TString file(offfile);
+    else if (typeInput == "MC")
+      TString file(mcfile);
+
     // name of input root file
     TString filenameData = outPath;
-    filenameData += onfile;
+    filenameData += file;
     filenameData += "Hillas";
     filenameData += typeInput;
-    filenameData += "1b.root";
+    filenameData += "1c.root";
     gLog << "filenameData = " << filenameData << endl; 
 
     // name of output root file
     TString outNameImage = outPath;
-    outNameImage += onfile;
+    outNameImage += file;
     outNameImage += "Hillas";
     outNameImage += typeInput;
-    outNameImage += "2b.root";
+    outNameImage += "2c.root";
     
 

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

@@ -433 +433 @@
   *fLog << all << "MSourcePosfromStarPos::ReInit; run = " << run << endl;
 
+  // define default values
+  Double_t xSource_def =  51.0; 
+  Double_t ySource_def = -59.0;
+  Double_t theta_def = 25.0;
+  Double_t phi_def   =  0.0;
+
   //-------------------------------------------------------------------
   // search this run in the list 
@@ -449 +455 @@
 
       *fLog << all << "theta, phi = " << thetarad*kRad2Deg << ",  "
-            << phirad*kRad2Deg << endl;
+            << phirad*kRad2Deg << " deg" << endl;
        
       //-----------------------------------------
@@ -485 +491 @@
         fSrcPos->SetReadyToSave();       
       }
+      else
+      {
+        // set default values
+        fxSource = xSource_def;
+        fySource = ySource_def;
+        fSrcPos->SetXY(fxSource, fySource);
+        fSrcPos->SetReadyToSave();       
+
+        *fLog << warn << "MSourcePosfromStarPos::ReInit;  no information on source position for run number = "
+              << run << endl;
+        *fLog << warn << "       set xSource, ySource = " << fxSource << ",  "
+              << fySource << " mm" << endl;
+      }
       
 
@@ -491 +510 @@
   }
   //-------------------------------------------------------------------  
-    *fLog << warn << "MSourcePosfromStarPos::ReInit;  no information for run number = "
-          << run << endl;
-
-    Double_t thetadeg = 25.0;
+
+    // set default values
+    fxSource = xSource_def;
+    fySource = ySource_def;
+    fSrcPos->SetXY(fxSource, fySource);
+    fSrcPos->SetReadyToSave();       
+
+    Double_t thetadeg = theta_def;
     Double_t thetarad = thetadeg / kRad2Deg;
     fMcEvt->SetTelescopeTheta(thetarad);
 
-    Double_t phideg = 0.0;
+    Double_t phideg = phi_def;
     Double_t phirad = phideg / kRad2Deg;
     fMcEvt->SetTelescopePhi(phirad);
     fMcEvt->SetReadyToSave();
+
+    *fLog << warn << "MSourcePosfromStarPos::ReInit;  no information on theta, phi and source position for run number = "
+          << run << endl;
+    *fLog << warn << "       set xSource, ySource = " << fxSource << ",  "
+          << fySource << " mm" << endl;
+    *fLog << warn << "       set theta, phi = " << thetadeg << ",  "
+          << phideg << " deg" << endl;
+
 
     return kTRUE;