Changeset 8139 for trunk/MagicSoft

Timestamp:

10/20/06 15:15:26 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/filloptical.C (modified) (7 diffs)
• datacenter/tools/fillobjects2.C (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/10/20 Daniela Dorner
+
+   * datacenter/tools/fillobjects.php, datacenter/tools/fillobjects2.C:
+     - added (macro to fill information about objects in optical DB)
+
+   * datacenter/macros/filloptical.C:
+     - added check to avoid filling invalid data
+     - added zd (retrieve ra,dec from table Object and fill zd into 
+       table OpticalData)
+
+
 
  2006/10/19 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/macros/filloptical.C

@@ -42 +42 @@
 #include <fstream>
 
+#include <TVector3.h>
+
 #include <TEnv.h>
 #include <TRegexp.h>
@@ -51 +53 @@
 #include "MSQLServer.h"
 #include "MSQLMagic.h"
+
+#include "MTime.h"
+#include "MObservatory.h"
+#include "MAstroSky2Local.h"
 
 using namespace std;
@@ -82 +88 @@
     TString status;
     TString query;
+    TString select;
     Int_t statuskey;
     Int_t objectkey;
     Int_t fitsfilekey;
+    Double_t ra=0;
+    Double_t dec=0;
+    Double_t zd=0;
+    MTime t;
+    MObservatory obs(MObservatory::kMagic1);
+    TVector3 v;
+
     while (1)
     {
@@ -108 +122 @@
             exposure   = (*arr)[2]->GetName();
             fitsfile = (*arr)[3]->GetName();
+            t.SetSqlDateTime(timestamp.Data());
             continue;
         }
@@ -118 +133 @@
             }
 
-            numstars+=1;
+            if (numstars==0)
+            {
+                select="SELECT fRightAscension, fDeclination FROM Object WHERE ";
+                select+=Form("fObjectName='%s/BL'", (*arr)[0]->GetName());
+
+                TSQLResult *res = serv.Query(select);
+                if (!res)
+                    return 2;
+
+                TSQLRow *row=res->Next();
+                ra=(*row)[0]?atof((*row)[0]):0;
+                dec=(*row)[1]?atof((*row)[1]):0;
+                delete res;
+
+                v.SetMagThetaPhi(1, TMath::Pi()/2-(dec*TMath::DegToRad()), ra*TMath::DegToRad()*15);
+                v *= MAstroSky2Local(t, obs);
+
+                zd = v.Theta()*TMath::RadToDeg();
+
+            }
+
             object= Form("%s/%s", (*arr)[0]->GetName(),(*arr)[1]->GetName());
             skylevel   = (*arr)[2]->GetName();
@@ -134 +169 @@
                 magerr="NULL";
             status = (*arr)[7]->GetName();
+            numstars+=1;
         }
         delete arr;
@@ -157 +193 @@
                        "fObjectKEY=%d, fSkyLevel=%s, fFWHM=%s, "
                        "fApertureRadius=%s, fInstrumentalMag=%s, "
-                       "fInstrumentalMagErr=%s, fStatusKEY=%d ",
+                       "fInstrumentalMagErr=%s, fStatusKEY=%d, fZenithDistance=",
                        timestamp.Data(), exposure.Data(), fitsfilekey,
                        objectkey, skylevel.Data(), fwhm.Data(),
                        aperturer.Data(), mag.Data(), magerr.Data(),
                        statuskey);
+
+            if (ra==0 || dec==0)
+                query+="NULL";
+            else
+                query+=Form("%.1f", zd);
 
             if (serv.Insert("OpticalData", query)==kFALSE)

trunk/MagicSoft/Mars/datacenter/tools/fillobjects2.C

@@ -116 +116 @@
         object=Form("%s/BL", object.Data());
 
-        query=Form("fRightAscension=%f, fDeclination=%f, fEpoche=2000",
+        query=Form("fRightAscension=%.7f, fDeclination=%.7f, fEpoche=2000",
                    ra, dec);