Changeset 17366

Timestamp:

11/23/13 17:58:41 (11 years ago)

Author:

tbretz

Message:

Updated prediction with something which takes the distance to the moon into account; updated database access

Location:

trunk/FACT++/src

Files:

• makedata.cc (modified) (2 diffs)
• makeplots.cc (modified) (2 diffs)

trunk/FACT++/src/makedata.cc

@@ -112 +112 @@
 
     const mysqlpp::StoreQueryResult res =
-        Database(fDatabase).query("SELECT fRightAscension, fDeclination FROM source WHERE fSourceName='"+source_name+"'").store();
+        Database(fDatabase).query("SELECT fRightAscension, fDeclination FROM Source WHERE fSourceName='"+source_name+"'").store();
 
     // ------------- Create canvases and frames ---------------------
@@ -151 +151 @@
         const double calt = sin(hrzm.alt*M_PI/180);
 
-        const double lc = cang==0 ? -1 : calt*pow(disk, 2.2)*pow(dist, -2);
-        const double cur = lc>0 ? 4+103*lc : 4;
+        //const double lc = cang==0 ? -1 : calt*pow(disk, 2.2)*pow(dist, -2);
+        //const double cur = lc>0 ? 4+103*lc : 4;
+
+        const double lc  = sqrt(calt)*pow(disk, 2.3)*pow(cang+1, 1)*pow(dist, -2);
+        const double cur = lc>0 ? 7.2 + 69*lc : 7.2;
 
         // Relative  energy threshold prediction

trunk/FACT++/src/makeplots.cc

@@ -140 +140 @@
 
     const mysqlpp::StoreQueryResult res =
-        Database(fDatabase).query("SELECT fSourceName, fRightAscension, fDeclination FROM source").store();
+        Database(fDatabase).query("SELECT fSourceName, fRightAscension, fDeclination FROM Source").store();
 
     // ------------- Create canvases and frames ---------------------
@@ -284 +284 @@
             const double calt = sin(hrzm.alt*M_PI/180);
 
-            const double lc = cang==0 ? -1 : calt*pow(disk, 2.2)*pow(dist, -2);
-            const double cur = lc>0 ? 4+103*lc : 4;
+            //const double lc = cang==0 ? -1 : calt*pow(disk, 2.2)*pow(dist, -2);
+            //const double cur = lc>0 ? 4+103*lc : 4;
+
+            const double lc  = sqrt(calt)*pow(disk, 2.3)*pow(cang+1, 1)*pow(dist, -2);
+            const double cur = lc>0 ? 7.2 + 69*lc : 7.2;
 
             // Relative  energy threshold prediction